diff --git a/README.rst b/README.rst index 87330b79d4cc8e14af21afd68951fd2ace058f12..9b54820820b9a4d932226ebefd203df352dfe7cd 100644 --- a/README.rst +++ b/README.rst @@ -62,6 +62,10 @@ You can get the **source code** from the **Git** repository of the project:: git clone git@gitlab.lis-lab.fr:dev/scikit-multimodallearn.git +or + + git clone git@github.com:multi-learn/scikit-multimodallearn.git + Testing ~~~~~~~ diff --git a/VERSION b/VERSION index 1f0d0271cf0b376ab34a890dfa1e3b262d7bc7ac..c1fee131b08bb8b61f65755d86037b7159b34ebc 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -multimodal:0.0.2 +multimodal:0.0.3 diff --git a/copyright.py b/copyright.py index f471123bb34c1224915666262dce11a8fdef2057..95e2f545adf5af5b748c88311eb926766510e0d8 100644 --- a/copyright.py +++ b/copyright.py @@ -70,9 +70,11 @@ def getVersionsAndDate(): def writeStamp(): """ Write a copyright stamp on all files """ stamp = getStamp(*getVersionsAndDate()) + print("stamp", stamp) files = findFiles(os.path.join(os.path.dirname(os.path.abspath(__file__)), "multimodal")) for filename in files: + print("filename", filename) fileStamping(filename, stamp) fileStamping("setup.py", stamp) diff --git a/copyrightstamp.txt b/copyrightstamp.txt index c863e02343ace6f078f794661f9ed2e1b30e8445..6daa2a82aac66c8b5333ef3b2e8fa32cdbb40105 100644 --- a/copyrightstamp.txt +++ b/copyrightstamp.txt @@ -6,7 +6,7 @@ Copyright(c) DATE * Université d'Aix Marseille (AMU) - * Centre National de la Recherche Scientifique (CNRS) - * Université de Toulon (UTLN). -* Copyright © 2019-2020 AMU, CNRS, UTLN +* Copyright © 2019-2025 AMU, CNRS, UTLN Contributors: ------------ @@ -36,5 +36,4 @@ Licence: License: New BSD License - -######### COPYRIGHT ######### +######### COPYRIGHT ######### \ No newline at end of file diff --git a/license.txt b/license.txt index 573f99a8258c728e1aa5bd241ec6941ed7a0d7c1..c962d5a382f1395bc0754f7f4c27c6eece834d68 100644 --- a/license.txt +++ b/license.txt @@ -1,6 +1,6 @@ New BSD License -Copyright (c) 2020-15-01, The scikit-multimodallearn developers. +Copyright (c) 2025-15-04, The scikit-multimodallearn developers. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/multimodal/__init__.py b/multimodal/__init__.py index 3b93d0be0c9ec9943a1076a0152b8c244261a3a1..27fdca497c37a411ce6797129774810e4f937b5b 100644 --- a/multimodal/__init__.py +++ b/multimodal/__init__.py @@ -1 +1 @@ -__version__ = "0.0.2" +__version__ = "0.0.3" diff --git a/multimodal/boosting/boost.py b/multimodal/boosting/boost.py index bf1f743604e526c765791d7de1164d04b3f5ca61..67c592e0c7b601276c768bd9453e18c43d1efc8c 100644 --- a/multimodal/boosting/boost.py +++ b/multimodal/boosting/boost.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- # ######### COPYRIGHT ######### # -# Copyright(c) 2020 +# Copyright(c) 2025 # ----------------- # # * Université d'Aix Marseille (AMU) - # * Centre National de la Recherche Scientifique (CNRS) - # * Université de Toulon (UTLN). -# * Copyright © 2019-2020 AMU, CNRS, UTLN +# * Copyright © 2019-2025 AMU, CNRS, UTLN # # Contributors: # ------------ @@ -30,7 +30,7 @@ # Version: # ------- # -# * multimodal version = 0.0.dev0 +# * multimodal version = 0.0.3 # # Licence: # ------- @@ -39,6 +39,8 @@ # # # ######### COPYRIGHT ######### +# +# import numpy as np import scipy.sparse as sp from abc import ABCMeta diff --git a/multimodal/boosting/combo.py b/multimodal/boosting/combo.py index 5f4ef5346c3b6946acf4cfcda3617fbf09884953..7f3bf903fc8f5794b87e40993a25f289dae1ce20 100644 --- a/multimodal/boosting/combo.py +++ b/multimodal/boosting/combo.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- # ######### COPYRIGHT ######### # -# Copyright(c) 2020 +# Copyright(c) 2025 # ----------------- # # * Université d'Aix Marseille (AMU) - # * Centre National de la Recherche Scientifique (CNRS) - # * Université de Toulon (UTLN). -# * Copyright © 2019-2020 AMU, CNRS, UTLN +# * Copyright © 2019-2025 AMU, CNRS, UTLN # # Contributors: # ------------ @@ -30,7 +30,7 @@ # Version: # ------- # -# * multimodal version = 0.0.dev0 +# * multimodal version = 0.0.3 # # Licence: # ------- @@ -39,6 +39,8 @@ # # # ######### COPYRIGHT ######### +# +# r""" This module contains a **Mu**\ lti\ **C**\ onfusion **M**\ Matrix **B**\ osting (**CoMBo**) diff --git a/multimodal/boosting/mumbo.py b/multimodal/boosting/mumbo.py index 30f66fe2e3a7138d8a9c43f759d56f50c5401787..8dd4b8445701d53eb62873a3decbc9739e0fd5e2 100644 --- a/multimodal/boosting/mumbo.py +++ b/multimodal/boosting/mumbo.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- # ######### COPYRIGHT ######### # -# Copyright(c) 2020 +# Copyright(c) 2025 # ----------------- # # * Université d'Aix Marseille (AMU) - # * Centre National de la Recherche Scientifique (CNRS) - # * Université de Toulon (UTLN). -# * Copyright © 2019-2020 AMU, CNRS, UTLN +# * Copyright © 2019-2025 AMU, CNRS, UTLN # # Contributors: # ------------ @@ -30,7 +30,7 @@ # Version: # ------- # -# * multimodal version = 0.0.dev0 +# * multimodal version = 0.0.3 # # Licence: # ------- @@ -39,6 +39,8 @@ # # # ######### COPYRIGHT ######### +# +# r"""Multimodal Boosting This module contains a **Mu**\ lti\ **M**\ odal **Bo**\ osting (**MuMBo**) diff --git a/multimodal/datasets/data_sample.py b/multimodal/datasets/data_sample.py index c44b360e9c2d808f51bcfa22acfd32e80b1db8fa..1af5affcc5bc337d3509153d3b8c43f55e6da352 100644 --- a/multimodal/datasets/data_sample.py +++ b/multimodal/datasets/data_sample.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- # ######### COPYRIGHT ######### # -# Copyright(c) 2020 +# Copyright(c) 2025 # ----------------- # # * Université d'Aix Marseille (AMU) - # * Centre National de la Recherche Scientifique (CNRS) - # * Université de Toulon (UTLN). -# * Copyright © 2019-2020 AMU, CNRS, UTLN +# * Copyright © 2019-2025 AMU, CNRS, UTLN # # Contributors: # ------------ @@ -24,13 +24,13 @@ # ----------- # # The multimodal package implement classifiers multiview, -# MumboClassifier class, MuCumboClassifier class, MVML class, MKL class. +# MumboClassifier class, MuComboClassifier class, MVML class, MKL class. # compatible with sklearn # # Version: # ------- # -# * multimodal version = 0.0.dev0 +# * multimodal version = 0.0.3 # # Licence: # ------- @@ -44,6 +44,8 @@ # # # +# +# """This module contains the DataSample class, MultiModalArray, MultiModalSparseArray, MultiModalSparseInfo and MultiModalData, class The DataSample class encapsulates a sample 's components diff --git a/multimodal/kernels/lpMKL.py b/multimodal/kernels/lpMKL.py index 7e2c7e276a88d66831fa56646ef8b60d2f0a9934..e5ec695bcf7e1344e079fee2e7213c7a3b59cfe0 100644 --- a/multimodal/kernels/lpMKL.py +++ b/multimodal/kernels/lpMKL.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- # ######### COPYRIGHT ######### # -# Copyright(c) 2020 +# Copyright(c) 2025 # ----------------- # # * Université d'Aix Marseille (AMU) - # * Centre National de la Recherche Scientifique (CNRS) - # * Université de Toulon (UTLN). -# * Copyright © 2019-2020 AMU, CNRS, UTLN +# * Copyright © 2019-2025 AMU, CNRS, UTLN # # Contributors: # ------------ @@ -30,7 +30,7 @@ # Version: # ------- # -# * multimodal version = 0.0.dev0 +# * multimodal version = 0.0.3 # # Licence: # ------- @@ -39,6 +39,8 @@ # # # ######### COPYRIGHT ######### +# +# import numpy as np from sklearn.base import BaseEstimator from sklearn.base import ClassifierMixin diff --git a/multimodal/kernels/mkernel.py b/multimodal/kernels/mkernel.py index 4424867767218f469bd6fea952b49f8032b83484..1166d0b5287d6c01eb67560a3cb75e6fbb0e2807 100644 --- a/multimodal/kernels/mkernel.py +++ b/multimodal/kernels/mkernel.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- # ######### COPYRIGHT ######### # -# Copyright(c) 2020 +# Copyright(c) 2025 # ----------------- # # * Université d'Aix Marseille (AMU) - # * Centre National de la Recherche Scientifique (CNRS) - # * Université de Toulon (UTLN). -# * Copyright © 2019-2020 AMU, CNRS, UTLN +# * Copyright © 2019-2025 AMU, CNRS, UTLN # # Contributors: # ------------ @@ -30,7 +30,7 @@ # Version: # ------- # -# * multimodal version = 0.0.dev0 +# * multimodal version = 0.0.3 # # Licence: # ------- @@ -40,6 +40,8 @@ # # ######### COPYRIGHT ######### # +# +# import numpy as np import scipy as sp from sklearn.metrics.pairwise import pairwise_kernels, PAIRWISE_KERNEL_FUNCTIONS diff --git a/multimodal/kernels/mvml.py b/multimodal/kernels/mvml.py index afee667b72dff9a4aed0f73c15ba1708741bbc1f..0a1c5d6f746ef6feb6151451dbe6188ed6564897 100644 --- a/multimodal/kernels/mvml.py +++ b/multimodal/kernels/mvml.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- # ######### COPYRIGHT ######### # -# Copyright(c) 2020 +# Copyright(c) 2025 # ----------------- # # * Université d'Aix Marseille (AMU) - # * Centre National de la Recherche Scientifique (CNRS) - # * Université de Toulon (UTLN). -# * Copyright © 2019-2020 AMU, CNRS, UTLN +# * Copyright © 2019-2025 AMU, CNRS, UTLN # # Contributors: # ------------ @@ -30,7 +30,7 @@ # Version: # ------- # -# * multimodal version = 0.0.dev0 +# * multimodal version = 0.0.3 # # Licence: # ------- @@ -39,6 +39,8 @@ # # # ######### COPYRIGHT ######### +# +# import numpy as np import scipy.linalg as spli from scipy.sparse.linalg import splu diff --git a/multimodal/tests/data/get_dataset_path.py b/multimodal/tests/data/get_dataset_path.py index f83880a01730ffde24f7f9c6c94fd65aa82afada..d2d4057e23ae201fc686b29eb4f5358ba08d917e 100644 --- a/multimodal/tests/data/get_dataset_path.py +++ b/multimodal/tests/data/get_dataset_path.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- # ######### COPYRIGHT ######### # -# Copyright(c) 2020 +# Copyright(c) 2025 # ----------------- # # * Université d'Aix Marseille (AMU) - # * Centre National de la Recherche Scientifique (CNRS) - # * Université de Toulon (UTLN). -# * Copyright © 2019-2020 AMU, CNRS, UTLN +# * Copyright © 2019-2025 AMU, CNRS, UTLN # # Contributors: # ------------ @@ -24,13 +24,13 @@ # ----------- # # The multimodal package implement classifiers multiview, -# MumboClassifier class, MuCumboClassifier class, MVML class, MKL class. +# MumboClassifier class, MuComboClassifier class, MVML class, MKL class. # compatible with sklearn # # Version: # ------- # -# * multimodal version = 0.0.dev0 +# * multimodal version = 0.0.3 # # Licence: # ------- @@ -44,6 +44,8 @@ # # # +# +# from __future__ import print_function, division diff --git a/multimodal/tests/datasets/get_dataset_path.py b/multimodal/tests/datasets/get_dataset_path.py index f83880a01730ffde24f7f9c6c94fd65aa82afada..d2d4057e23ae201fc686b29eb4f5358ba08d917e 100644 --- a/multimodal/tests/datasets/get_dataset_path.py +++ b/multimodal/tests/datasets/get_dataset_path.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- # ######### COPYRIGHT ######### # -# Copyright(c) 2020 +# Copyright(c) 2025 # ----------------- # # * Université d'Aix Marseille (AMU) - # * Centre National de la Recherche Scientifique (CNRS) - # * Université de Toulon (UTLN). -# * Copyright © 2019-2020 AMU, CNRS, UTLN +# * Copyright © 2019-2025 AMU, CNRS, UTLN # # Contributors: # ------------ @@ -24,13 +24,13 @@ # ----------- # # The multimodal package implement classifiers multiview, -# MumboClassifier class, MuCumboClassifier class, MVML class, MKL class. +# MumboClassifier class, MuComboClassifier class, MVML class, MKL class. # compatible with sklearn # # Version: # ------- # -# * multimodal version = 0.0.dev0 +# * multimodal version = 0.0.3 # # Licence: # ------- @@ -44,6 +44,8 @@ # # # +# +# from __future__ import print_function, division diff --git a/multimodal/tests/test_combo.py b/multimodal/tests/test_combo.py index 5b864e62c9e581cf0d638591b8c21dd537d6f22e..ddf9c1de697964409ad4c85b71558753dae15501 100644 --- a/multimodal/tests/test_combo.py +++ b/multimodal/tests/test_combo.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- # ######### COPYRIGHT ######### # -# Copyright(c) 2020 +# Copyright(c) 2025 # ----------------- # # * Université d'Aix Marseille (AMU) - # * Centre National de la Recherche Scientifique (CNRS) - # * Université de Toulon (UTLN). -# * Copyright © 2019-2020 AMU, CNRS, UTLN +# * Copyright © 2019-2025 AMU, CNRS, UTLN # # Contributors: # ------------ @@ -30,7 +30,7 @@ # Version: # ------- # -# * multimodal version = 0.0.dev0 +# * multimodal version = 0.0.3 # # Licence: # ------- @@ -44,6 +44,8 @@ # # # +# +# """Testing for the mumbo module.""" diff --git a/multimodal/tests/test_data_sample.py b/multimodal/tests/test_data_sample.py index a25977e9c6b1bd9bc38521dd5e739da3ad7a04b1..80af0b6f91f3a64c5d8a01718c9fdb21677ffc93 100644 --- a/multimodal/tests/test_data_sample.py +++ b/multimodal/tests/test_data_sample.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- # ######### COPYRIGHT ######### # -# Copyright(c) 2020 +# Copyright(c) 2025 # ----------------- # # * Université d'Aix Marseille (AMU) - # * Centre National de la Recherche Scientifique (CNRS) - # * Université de Toulon (UTLN). -# * Copyright © 2019-2020 AMU, CNRS, UTLN +# * Copyright © 2019-2025 AMU, CNRS, UTLN # # Contributors: # ------------ @@ -30,7 +30,7 @@ # Version: # ------- # -# * multimodal version = 0.0.dev0 +# * multimodal version = 0.0.3 # # Licence: # ------- @@ -39,6 +39,8 @@ # # # ######### COPYRIGHT ######### +# +# import unittest import numpy as np diff --git a/multimodal/tests/test_mkl.py b/multimodal/tests/test_mkl.py index b384db4ccda716ff50ced1313f9e336725482beb..6dc8951e8eaac429932d9d99c3c08055bd989952 100644 --- a/multimodal/tests/test_mkl.py +++ b/multimodal/tests/test_mkl.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- # ######### COPYRIGHT ######### # -# Copyright(c) 2020 +# Copyright(c) 2025 # ----------------- # # * Université d'Aix Marseille (AMU) - # * Centre National de la Recherche Scientifique (CNRS) - # * Université de Toulon (UTLN). -# * Copyright © 2019-2020 AMU, CNRS, UTLN +# * Copyright © 2019-2025 AMU, CNRS, UTLN # # Contributors: # ------------ @@ -30,7 +30,7 @@ # Version: # ------- # -# * multimodal version = 0.0.dev0 +# * multimodal version = 0.0.3 # # Licence: # ------- @@ -39,6 +39,8 @@ # # # ######### COPYRIGHT ######### +# +# import unittest import numpy as np from sklearn.metrics.pairwise import rbf_kernel diff --git a/multimodal/tests/test_mumbo.py b/multimodal/tests/test_mumbo.py index 204097c05f92c5e333c5b7b6be8f97efa1dabfe5..b513b0973f52dd03353fd83b1968bfa64e2969d0 100644 --- a/multimodal/tests/test_mumbo.py +++ b/multimodal/tests/test_mumbo.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- # ######### COPYRIGHT ######### # -# Copyright(c) 2020 +# Copyright(c) 2025 # ----------------- # # * Université d'Aix Marseille (AMU) - # * Centre National de la Recherche Scientifique (CNRS) - # * Université de Toulon (UTLN). -# * Copyright © 2019-2020 AMU, CNRS, UTLN +# * Copyright © 2019-2025 AMU, CNRS, UTLN # # Contributors: # ------------ @@ -30,7 +30,7 @@ # Version: # ------- # -# * multimodal version = 0.0.dev0 +# * multimodal version = 0.0.3 # # Licence: # ------- @@ -39,6 +39,8 @@ # # # ######### COPYRIGHT ######### +# +# #"""Testing for the mumbo module."""# # Author: Florent JAILLET - Laboratoire d'Informatique et Systèmes - UMR 7020 diff --git a/multimodal/tests/test_mvml.py b/multimodal/tests/test_mvml.py index 3a27d97ebdbe3114b12e306d5d04777af99aa7fc..9d5b69abb136113257109e3ffc8cada1e1f47e2e 100644 --- a/multimodal/tests/test_mvml.py +++ b/multimodal/tests/test_mvml.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- # ######### COPYRIGHT ######### # -# Copyright(c) 2020 +# Copyright(c) 2025 # ----------------- # # * Université d'Aix Marseille (AMU) - # * Centre National de la Recherche Scientifique (CNRS) - # * Université de Toulon (UTLN). -# * Copyright © 2019-2020 AMU, CNRS, UTLN +# * Copyright © 2019-2025 AMU, CNRS, UTLN # # Contributors: # ------------ @@ -30,7 +30,7 @@ # Version: # ------- # -# * multimodal version = 0.0.dev0 +# * multimodal version = 0.0.3 # # Licence: # ------- @@ -39,6 +39,8 @@ # # # ######### COPYRIGHT ######### +# +# import pickle import unittest diff --git a/setup.py b/setup.py index 50c5e73ec1556dcd23f92856fb516a2c3639a60f..68db76dfabaff678a75418ae5648b6b3dc195437 100644 --- a/setup.py +++ b/setup.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- # ######### COPYRIGHT ######### # -# Copyright(c) 2020 +# Copyright(c) 2025 # ----------------- # # * Université d'Aix Marseille (AMU) - # * Centre National de la Recherche Scientifique (CNRS) - # * Université de Toulon (UTLN). -# * Copyright © 2019-2020 AMU, CNRS, UTLN +# * Copyright © 2019-2025 AMU, CNRS, UTLN # # Contributors: # ------------ @@ -30,9 +30,9 @@ # Version: # ------- # -# * multimodal version = 0.0.dev0 +# * multimodal version = 0.0.3 # -# Licence:( +# Licence: # ------- # # License: New BSD License @@ -61,7 +61,7 @@ try: from copyright import writeStamp, eraseStamp except ImportError: USE_COPYRIGHT = False - +print(USE_COPYRIGHT) ################### # Get Multimodal version #################### @@ -128,7 +128,6 @@ class m_sdist(sdist): WARNING : The stamping must be done on an default utf8 machine ! """ - def run(self): if USE_COPYRIGHT: writeStamp()