Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
scikit-multimodallearn
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
dev
scikit-multimodallearn
Commits
ff3535ab
Commit
ff3535ab
authored
5 years ago
by
Dominique Benielli
Browse files
Options
Downloads
Patches
Plain Diff
test passed
parent
851a608c
No related branches found
No related tags found
No related merge requests found
Pipeline
#3873
failed
5 years ago
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
README.rst
+3
-5
3 additions, 5 deletions
README.rst
multimodal/datasets/data_sample.py
+5
-2
5 additions, 2 deletions
multimodal/datasets/data_sample.py
with
8 additions
and
7 deletions
README.rst
+
3
−
5
View file @
ff3535ab
...
@@ -58,7 +58,7 @@ Testing
...
@@ -58,7 +58,7 @@ Testing
**pytest** and **pytest-cov** are required to run the **test suite** with::
**pytest** and **pytest-cov** are required to run the **test suite** with::
cd multi
confusion
cd multi
modal
pytest
pytest
A code coverage report is displayed in the terminal when running the tests.
A code coverage report is displayed in the terminal when running the tests.
...
@@ -141,7 +141,5 @@ Copyright © 2017-2018 AMU, CNRS, UTLN
...
@@ -141,7 +141,5 @@ Copyright © 2017-2018 AMU, CNRS, UTLN
License
License
~~~~~~~
~~~~~~~
**multiconfusion** is free software: you can redistribute it and/or modify
**scikit-multimodallearn** is free software: you can redistribute it and/or modify
it under the terms of the **GNU Lesser General Public License** as published by
it under the terms of the **New BSD License**
the Free Software Foundation, either **version 3** of the License, or
(at your option) any later version.
This diff is collapsed.
Click to expand it.
multimodal/datasets/data_sample.py
+
5
−
2
View file @
ff3535ab
...
@@ -355,8 +355,11 @@ class MultiModalArray(np.ndarray, MultiModalData):
...
@@ -355,8 +355,11 @@ class MultiModalArray(np.ndarray, MultiModalData):
view_ind = np.array([0, new_data.shape[1]])
view_ind = np.array([0, new_data.shape[1]])
except Exception as e:
except Exception as e:
raise ValueError(
'
Reshape
your
data
'
)
raise ValueError(
'
Reshape
your
data
'
)
if new_data.ndim < 2 :
if new_data.ndim < 2 or new_data.shape == (1, 1) or view_ind[-1] > new_data.shape[1]:
raise ValueError(
'
Reshape
your
data
'
)
if new_data.ndim > 1 and new_data.shape == (1, 1):
raise ValueError(
'
Reshape
your
data
'
)
if view_ind.ndim < 2 and new_data.ndim <2 and view_ind[-1] > new_data.shape[1]:
raise ValueError(
'
Reshape
your
data
'
)
raise ValueError(
'
Reshape
your
data
'
)
# view_ind_self = view_ind
# view_ind_self = view_ind
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment