[MNT] Modify details

examples/examples1/example_rkme.py

@@ -7,7 +7,7 @@
  for i in range(10):
  data_X[i, i] = np.nan
  spec1 = specification.utils.generate_rkme_spec(X=data_X, gamma=0.1, cuda_idx=-1)
- spec2 = specification.rkme.RKMESpecification()
+ spec2 = specification.rkme.RKMEStatSpecification()
  spec1.generate_stat_spec_from_data(data_X)
  spec1.save("spec.json")
 

examples/examples2/svm/__init__.py

@@ -1,9 +1,10 @@
 import os
 import joblib
 import numpy as np
+from learnware.model import BaseModel
 
 
-class SVM:
+class SVM(BaseModel):
  def __init__(self):
  dir_path = os.path.dirname(os.path.abspath(__file__))
  self.model = joblib.load(os.path.join(dir_path, "svm.pkl"))

learnware/learnware/base.py

@@ -8,10 +8,10 @@
 
 
 class Learnware:
- def __init__(self, id: str, name: str, model: BaseModel, specification: Specification, desc: str):
+ def __init__(self, id: str, name: str, model: Union[BaseModel, dict], specification: Specification, desc: str):
  self.id = id
  self.name = name
- self.model = model
+ self.model = self._import_model(model)
  self.specification = specification
  self.desc = desc
 

learnware/market/anchor.py

@@ -2,11 +2,10 @@
 from typing import Tuple, Any, List, Union, Dict
 
 from ..learnware import Learnware
-from .base import BaseMarket
-from .easy import EasyUserInfo
+from .base import BaseMarket, BaseUserInfo
 
 
-class AnchoredUserInfo(EasyUserInfo):
+class AnchoredUserInfo(BaseUserInfo):
  """
  User Information for searching learnware (add the anchor design)
 

learnware/market/base.py

@@ -10,11 +10,34 @@
 class BaseUserInfo:
  """User Information for searching learnware"""
 
+ def __init__(self, id: str, semantic_spec: dict = dict(), stat_info: dict = dict()):
+ """Initializing user information
+
+ Parameters
+ ----------
+ id : str
+ user id
+ semantic_spec : dict, optional
+ semantic_spec selected by user, by default dict()
+ stat_info : dict, optional
+ statistical information uploaded by user, by default dict()
+ """
+ self.id = id
+ self.semantic_spec = semantic_spec
+ self.stat_info = stat_info
+
  def get_semantic_spec(self) -> dict:
- raise NotImplementedError("get_semantic_spec is Not Implemented")
+ """Return user semantic specifications
+
+ Returns
+ -------
+ dict
+ user semantic specifications
+ """
+ return self.semantic_spec
 
  def get_stat_info(self, name: str):
- raise NotImplementedError("get_stat_info is Not Implemented")
+ return self.stat_info.get(name, None)
 
 
 class BaseMarket:

learnware/market/easy.py

@@ -8,37 +8,6 @@
 from ..specification import RKMEStatSpecification
 
 
-class EasyUserInfo(BaseUserInfo):
- def __init__(self, id: str, semantic_spec: dict = dict(), stat_info: dict = dict()):
- """Initializing user information
-
- Parameters
- ----------
- id : str
- user id
- semantic_spec : dict, optional
- semantic_spec selected by user, by default dict()
- stat_info : dict, optional
- statistical information uploaded by user, by default dict()
- """
- self.id = id
- self.semantic_spec = semantic_spec
- self.stat_info = stat_info
-
- def get_semantic_spec(self) -> dict:
- """Return user semantic specifications
-
- Returns
- -------
- dict
- user semantic specifications
- """
- return self.semantic_spec
-
- def get_stat_info(self, name: str):
- return self.stat_info.get(name, None)
-
-
 class EasyMarket(BaseMarket):
  def __init__(self):
  """Initializing an empty market"""
@@ -164,6 +133,8 @@ def match_semantic_spec(semantic_spec1, semantic_spec2):
  return match_learnwares
 
  match_learnwares = search_by_semantic_spec()
+ # return match_learnwares
+ # TODO:
 
  def delete_learnware(self, id: str) -> bool:
  if not id in self.learnware_list:

learnware/specification/base.py

@@ -18,7 +18,7 @@ def load(self, filepath: str):
 class Specification:
  def __init__(self, semantic_spec=None):
  self.semantic_spec = semantic_spec
- self.stat_spec = BaseStatSpecification() # stat_spec should be dict
+ self.stat_spec = {} # stat_spec should be dict
 
  def get_stat_spec(self):
  return self.stat_spec