From ca42b37a7c327902b520c8058ac81140b252c4cd Mon Sep 17 00:00:00 2001 From: Robin Vogel Date: Sun, 27 Oct 2019 14:00:30 +0100 Subject: [PATCH 1/4] solved issue 225 --- metric_learn/lmnn.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/metric_learn/lmnn.py b/metric_learn/lmnn.py index 15dd9a18..a9e9d273 100644 --- a/metric_learn/lmnn.py +++ b/metric_learn/lmnn.py @@ -224,6 +224,9 @@ def fit(self, X, y): it = 1 # we already made one iteration + if self.verbose: + print("it | objective | delta_obj | total_active | learn_rate") + # main loop for it in xrange(2, self.max_iter): # then at each iteration, we try to find a value of L that has better From b4ab6836695a9a8c7ff94e136426aacae5429eb4 Mon Sep 17 00:00:00 2001 From: RobinVogel Date: Sun, 27 Oct 2019 14:22:54 +0100 Subject: [PATCH 2/4] maj --- test.py | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 test.py diff --git a/test.py b/test.py new file mode 100644 index 00000000..75773b8b --- /dev/null +++ b/test.py @@ -0,0 +1,8 @@ +from sklearn.model_selection import train_test_split +from sklearn.datasets import load_iris +from metric_learn import LMNN + +X, y = load_iris(return_X_y=True) +X_train, X_test, y_train, y_test = train_test_split(X, y) +model = LMNN(verbose=True) +model.fit(X_train, y_train) From 11b46f6ee2f3e38a3a87ebedd899ebdcac4c35a2 Mon Sep 17 00:00:00 2001 From: RobinVogel Date: Mon, 28 Oct 2019 14:37:24 +0100 Subject: [PATCH 3/4] maj --- metric_learn/lmnn.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/metric_learn/lmnn.py b/metric_learn/lmnn.py index a9e9d273..a1b5a42f 100644 --- a/metric_learn/lmnn.py +++ b/metric_learn/lmnn.py @@ -225,7 +225,8 @@ def fit(self, X, y): it = 1 # we already made one iteration if self.verbose: - print("it | objective | delta_obj | total_active | learn_rate") + print("iter | objective | objective difference | active constraints", + "| learning rate") # main loop for it in xrange(2, self.max_iter): From 1e2f6b9b22652c5d951dd345f11cfe599662d39e Mon Sep 17 00:00:00 2001 From: Robin Vogel Date: Mon, 28 Oct 2019 15:07:28 +0100 Subject: [PATCH 4/4] Delete test.py --- test.py | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 test.py diff --git a/test.py b/test.py deleted file mode 100644 index 75773b8b..00000000 --- a/test.py +++ /dev/null @@ -1,8 +0,0 @@ -from sklearn.model_selection import train_test_split -from sklearn.datasets import load_iris -from metric_learn import LMNN - -X, y = load_iris(return_X_y=True) -X_train, X_test, y_train, y_test = train_test_split(X, y) -model = LMNN(verbose=True) -model.fit(X_train, y_train)