diff --git a/doc/index.rst b/doc/index.rst index d21b6f50d0190a376ee1faac8a1cd976f661a675..9c08361760adf253f850dcc8f1896693dd5d98f9 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -27,6 +27,7 @@ Documentation tutorial/auto_examples/sg_execution_times + Indices and tables ------------------ diff --git a/doc/tutorial/auto_examples/cumbo/sg_execution_times.rst b/doc/tutorial/auto_examples/cumbo/sg_execution_times.rst index 8d71d51ea6217a19f9d1624037b9c6130b9c3aa2..79796437f40a6b417cf88df0c276e77c223ffe11 100644 --- a/doc/tutorial/auto_examples/cumbo/sg_execution_times.rst +++ b/doc/tutorial/auto_examples/cumbo/sg_execution_times.rst @@ -1,8 +1,4 @@ -:orphan: - -.. _sphx_glr_tutorial_auto_examples_cumbo_sg_execution_times: - Computation times ================= **00:01.113** total execution time for **tutorial_auto_examples_cumbo** files: diff --git a/doc/tutorial/auto_examples/sg_execution_times.rst b/doc/tutorial/auto_examples/sg_execution_times.rst index 299a794c335123196d31463dad8f9b2a186c2615..ad4622b36db4bb2023ac39373616e774ed97e72d 100644 --- a/doc/tutorial/auto_examples/sg_execution_times.rst +++ b/doc/tutorial/auto_examples/sg_execution_times.rst @@ -7,12 +7,12 @@ Computation times ================= **00:02.336** total execution time for **tutorial_auto_examples** files: -+-----------------------------------------------------------------------------------------------------+-----------+--------+ -| :ref:`sphx_glr_auto_examples_mumbo_plot_3_views_3_classes.py` (``mumbo_plot_3_views_3_classes.py``) | 00:01.313 | 0.0 MB | -+-----------------------------------------------------------------------------------------------------+-----------+--------+ -| :ref:`sphx_glr_auto_examples_mumbo_plot_2_views_2_classes.py` (``mumbo_plot_2_views_2_classes.py``) | 00:01.023 | 0.0 MB | -+-----------------------------------------------------------------------------------------------------+-----------+--------+ -| :ref:`sphx_glr_auto_examples_cumbo_plot_3_views_3_classes.py` (``cumbo_plot_3_views_3_classes.py``) | 00:01.313 | 0.0 MB | -+-----------------------------------------------------------------------------------------------------+-----------+--------+ -| :ref:`sphx_glr_auto_examples_cumbo_plot_2_views_2_classes.py` (``cumbo_plot_2_views_2_classes.py``) | 00:01.023 | 0.0 MB | -+-----------------------------------------------------------------------------------------------------+-----------+--------+ + +.. toctree:: + :maxdepth: 2 + :caption: Contents: + + + tutorial/auto_examples/mumbo/sg_execution_times + tutorial/auto_examples/cumbo/sg_execution_times + tutorial/auto_examples/mvml/sg_execution_times diff --git a/multimodal/kernels/mvml.py b/multimodal/kernels/mvml.py index 3fb46b41de161d5e02f2152006eef1a6faf36219..99443db6bd2c59b86f9e06b2bd857180630902a9 100644 --- a/multimodal/kernels/mvml.py +++ b/multimodal/kernels/mvml.py @@ -244,11 +244,9 @@ class MVML(MKernel, BaseEstimator, ClassifierMixin): # ========= learn ========= loop_counter = 0 while True: - if loop_counter > 0: - g_prev = np.copy(g) - A_prev = np.copy(A) - w_prev = np.copy(w) - + g_prev = np.copy(g) + A_prev = np.copy(A) + w_prev = np.copy(w) # ========= update g ========= # first invert A diff --git a/multimodal/tests/datasets/input_x_dic.pkl b/multimodal/tests/datasets/input_x_dic.pkl index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0c2774b9005c126b698ccbf9741cda5ed3dfbf2f 100644 Binary files a/multimodal/tests/datasets/input_x_dic.pkl and b/multimodal/tests/datasets/input_x_dic.pkl differ diff --git a/multimodal/tests/test_mvml.py b/multimodal/tests/test_mvml.py index 4627c5df8916fa36ea52b51fc88fa23c0d7714aa..32624f2be8d258483f06f5654902eb836a8b0f9f 100644 --- a/multimodal/tests/test_mvml.py +++ b/multimodal/tests/test_mvml.py @@ -81,7 +81,7 @@ class MVMLTest(unittest.TestCase): mvml.fit(self.kernel_dict, y=self.y, views_ind=None) self.assertEqual(mvml.A.shape, (48, 48)) self.assertEqual(mvml.g.shape,(48, 1)) - w_expected = np.array([0.73849765, 0.52974952]) + w_expected = np.array([0.655, 0.65 ]) np.testing.assert_almost_equal(mvml.w, w_expected, 3) def testFitMVMLMetric(self):