Merge pull request #32 from Learnware-LAMDA/refactor_specs

[MNT] Refactor Specification

.github/workflow/install_learnware_with_source.yaml

@@ -1,4 +1,4 @@
-name: Test leanrnware from pip
+name: Test leanrnware from source code
 
 on:
   push:

learnware/specification/__init__.py

@@ -1,3 +1,3 @@
 from .utils import generate_stat_spec
 from .base import Specification, BaseStatSpecification
-from .table import RKMEStatSpecification
+from .regular import RKMEStatSpecification

learnware/specification/base.py

@@ -15,11 +15,8 @@ class BaseStatSpecification:
         """
         self.type = type
 
-    def generate_stat_spec_from_data(self, **kwargs):
-        """Construct statistical specification from raw dataset
-        - kwargs may include the feature, label and model
-        - kwargs also can include hyperparameters of specific method for specifaction generation
-        """
+    def generate_stat_spec(self, **kwargs):
+        """Construct statistical specification"""
         raise NotImplementedError("generate_stat_spec_from_data is not implemented")
 
     def save(self, filepath: str):

learnware/specification/regular/__init__.py

@@ -0,0 +1 @@
+from .table import RKMEStatSpecification

learnware/specification/regular/base.py

@@ -0,0 +1,13 @@
+from ..base import BaseStatSpecification
+
+
+class RegularStatsSpecification(BaseStatSpecification):
+    def generate_stat_spec(self, **kwargs):
+        self.generate_stat_spec_from_data(**kwargs)
+
+    def generate_stat_spec_from_data(self, **kwargs):
+        """Construct statistical specification from raw dataset
+        - kwargs may include the feature, label and model
+        - kwargs also can include hyperparameters of specific method for specifaction generation
+        """
+        raise NotImplementedError("generate_stat_spec_from_data is not implemented")

learnware/specification/table/rkme.py → learnware/specification/regular/table/rkme.py

@@ -20,8 +20,8 @@ try:
 except ImportError:
     _FAISS_INSTALLED = False
 
-from ..base import BaseStatSpecification
-from ...logger import get_module_logger
+from ..base import RegularStatsSpecification
+from ....logger import get_module_logger
 
 logger = get_module_logger("rkme")
 
@@ -30,7 +30,7 @@ if not _FAISS_INSTALLED:
     logger.warning('Please run "conda install -c pytorch faiss-cpu" first.')
 
 
-class RKMEStatSpecification(BaseStatSpecification):
+class RKMEStatSpecification(RegularStatsSpecification):
     """Reduced Kernel Mean Embedding (RKME) Specification"""
 
     def __init__(self, gamma: float = 0.1, cuda_idx: int = -1):

learnware/specification/system/heter_table.py

@@ -0,0 +1,15 @@
+from ..base import BaseStatSpecification
+
+
+class HeterMapTableSpecification(BaseStatSpecification):
+    def generate_stat_spec(self, **kwargs):
+        pass
+
+    def save(self, filepath: str):
+        pass
+
+    def load(self, filepath: str):
+        pass
+
+    def dist(self, other_spec):
+        pass

learnware/specification/utils.py

@@ -4,7 +4,7 @@ import pandas as pd
 from typing import Union
 
 from .base import BaseStatSpecification
-from .table import RKMEStatSpecification
+from .regular import RKMEStatSpecification
 from ..config import C