Skip to content

[MRG] FIX: make proposal for sdml formulation #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 78 commits into from
Mar 22, 2019
Merged

[MRG] FIX: make proposal for sdml formulation #162

Changes from 1 commit
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
02cc937
FIX: make proposal for sdml formulation
Jan 24, 2019
aebd47f
MAINT clearer formulation to make the prior appear
Jan 29, 2019
40b2c88
MAINT call the prior prior
Jan 29, 2019
fb04cc9
Use skggm instead of graphical lasso
Feb 1, 2019
518d6e8
Be more severe for the class separation
Feb 1, 2019
c912e93
Merge branch 'master' into fix/proposal_for_sdml
Feb 1, 2019
8f0b113
Put back verbose param
Feb 1, 2019
c57a35a
MAINT: make more explicit the fact that to use identity (i.e. an SPD …
Feb 1, 2019
f0eb938
Add skggm as a requirement for SDML
Feb 1, 2019
821db0b
Add skggm to required packages for travis
Feb 1, 2019
bd2862d
Also add cython as a dependency
Feb 1, 2019
c6a2daa
FIX: install all except skggm and then skggm
Feb 1, 2019
93d790e
Remove cython dependency
Feb 1, 2019
cae6c28
Install skggm only if we have at least python 3.6
Feb 15, 2019
5d673ba
Should work if we want other versions superior to 3.6
Feb 15, 2019
e8a28d5
Fix bash >= which should be written -ge
Feb 15, 2019
e740702
Deal with tests when skggm is not installed and fix some PEP8 warnings
Feb 15, 2019
333675b
replace manual calls of algorithms with tuples_learners
Feb 15, 2019
1a6e97b
Remove another call of SDML if skggm is not installed
Feb 15, 2019
7cecf27
FIX fix the test_error_message_tuple_size
Feb 15, 2019
5303e1a
FIX fix test_sdml_supervised
Feb 15, 2019
377760a
FIX: fix another sdml test
Feb 15, 2019
0a46ad5
FIX quic call for python 2.7
Feb 15, 2019
391d773
Fix quic import
Feb 15, 2019
6654769
Add Sigma0 initalization (both sigma zero and theta zero should be sp…
Feb 15, 2019
ac4e18a
Deal with SDML making some tests fail
Feb 15, 2019
458d646
Remove epsilon that was unnecessary
Feb 15, 2019
fd7c9fb
FIX: use latest commit of skggm that fixes the non deterministic problem
Feb 19, 2019
e118cd8
MAINT: add message for SDML when not SPD
Mar 5, 2019
b0c4753
MAINT: add test for error message if skggm not installed
Mar 5, 2019
13146d8
Try other syntax for installing the right commit of skggm
Mar 5, 2019
db4a799
MAINT: make sklearn compat sdml test be run only if skggm is installed
Mar 5, 2019
1011391
Try another syntax for running travis
Mar 5, 2019
5ea7ba0
Better bash syntax
Mar 5, 2019
45d3b7b
Fix tests by removing duplicates
Mar 6, 2019
dbf5257
FIX: fix for sdml by reducing balance parameter
Mar 6, 2019
4b0bae9
FIX: update code to work with old version of numpy that does not have…
Mar 6, 2019
f3c690e
Remove the need for skggm
Mar 7, 2019
57b0567
Update travis not to use skggm
Mar 7, 2019
04316b2
Add a stable init for sklearn checks
Mar 7, 2019
b641641
FIX test_sdml_supervised
Mar 7, 2019
fedfb8e
Revert "Update travis not to use skggm"
Mar 8, 2019
f0bbf6d
Add fallback on skggm
Mar 8, 2019
520d7c2
FIX: fix versions comparison and tests
Mar 8, 2019
0437c62
MAINT: improve test of no warning
Mar 8, 2019
be1a5e6
FIX: fix wrap pairs that was returning column y (we need line y), and…
Mar 8, 2019
56efa09
FIX: force travis to do the right check
Mar 8, 2019
142eea9
TST: add non SPD test that works with skggm's quic but not sklearn's …
Mar 8, 2019
fcfd44c
Try again travis this time installing cython
Mar 8, 2019
019e28b
Try to make travis work with build_essential
Mar 8, 2019
04a5107
Try with installing liblapack
Mar 8, 2019
be3a2ad
TST: fix tests for when skggm is not installed
Mar 8, 2019
1ee8d1f
TST: use better pytest skipif syntax
Mar 8, 2019
03f4158
FIX: fix broken link in README.md
Mar 8, 2019
e621e27
use rst syntax for link
Mar 8, 2019
0086c98
use rst syntax for link
Mar 8, 2019
001600e
use rst syntax for link
Mar 8, 2019
8c50a0d
MAINT: remove test_sdml that was remaining from drafts tests
Mar 8, 2019
e4132d6
TST: remove skipping SDML in test_cross_validation_manual_vs_scikit
Mar 8, 2019
b3bf6a8
FIX link also in getting started
Mar 8, 2019
49f3b9e
Put back right indent
Mar 8, 2019
e1664c7
Remove unnecessary changes
Mar 8, 2019
187e22c
merging
Mar 18, 2019
60866cb
Nitpick for concatenation and refactor HAS_SKGGM
Mar 18, 2019
eb95719
ENH: Deal better with errors and skggm/scikit-learn
Mar 18, 2019
4d61dba
Better creation of prior
Mar 18, 2019
71a02e0
Simplification for init of sdml
Mar 18, 2019
1e6d440
Put skggm as optional
Mar 18, 2019
a7ed1bb
Specify skggm version
Mar 18, 2019
31072d3
TST: make test about 1 feature arrays more readable
Mar 18, 2019
000f29a
DOC: fix rst formatting
Mar 18, 2019
169dccf
DOC: reformulated skggm optional dependency
Mar 18, 2019
bfb0f8f
TST: give an example for sdml_supervised with skggm where it indeed f…
Mar 20, 2019
6f5666b
TST: fix test that fails weirdly when executing the whole test file a…
Mar 20, 2019
0973ef2
Revert "TST: fix test that fails weirdly when executing the whole tes…
Mar 20, 2019
1c28ecd
Merge branch 'master' into fix/proposal_for_sdml
wdevazelhes Mar 21, 2019
df2ae9c
Add coverage for all versions of python
Mar 21, 2019
9683934
Install pytest-cov for all versions
Mar 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/metric_learn_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ def test_iris(self):
sdml = SDML_Supervised(num_constraints=1500)
sdml.fit(self.iris_points, self.iris_labels, random_state=rs)
csep = class_separation(sdml.transform(self.iris_points), self.iris_labels)
self.assertLess(csep, 0.25)
self.assertLess(csep, 0.20)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The score that I had when running the example was 0.1933487414312185 so I thought let's be a bit more conservative that 0.25 so that if it fails we would be warned


def test_deprecation(self):
# test that the right deprecation message is thrown.
Expand Down