ltfmselector 0.2.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

ltfmselector/env.py

@@ -364,6 +364,7 @@ class Environment:
         # Get number of total recruited features
         nFSubset = (self.get_feature_mask()).sum()
 
+        # DEV:: If more than 10 statements, implement dictionary instead
         if self.fQueryFunction == "step":
             return self.get_fQueryCostStep(nFSubset)
         elif self.fQueryFunction == "linear":
@@ -380,17 +381,26 @@ class Environment:
 
     def get_fQueryCostLinear(self, _nFSubset):
         '''Linear function for querying feature'''
-        return max(
+        _qC = max(
             self.fQueryCost,
             self.fQueryCost + self.fRate*(_nFSubset-self.fThreshold)
         )
+        if not self.fCap is None:
+            return min(self.fCap, _qC)
+        else:
+            return _qC
 
     def get_fQueryCostQuadratic(self, _nFSubset):
         '''Quadratic function for querying feature'''
         if _nFSubset > self.fThreshold:
-            return self.fQueryCost + self.fRate*(_nFSubset-self.fThreshold)**2
+            _qC = self.fQueryCost + self.fRate*(_nFSubset-self.fThreshold)**2
         else:
-            return self.fQueryCost
+            _qC = self.fQueryCost
+
+        if not self.fCap is None:
+            return min(self.fCap, _qC)
+        else:
+            return _qC
 
     def get_feature_mask(self):
         '''

ltfmselector/ltfmselector.py

@@ -128,10 +128,11 @@ class LTFMSelector:
             increases
             
         fCap : None or float
-            If `fQueryFunction == {'step'}`, upper limit of penalty
+            If `fQueryFunction == {'step', 'linear', 'quadratic'}`, upper 
+            limit of penalty
 
         fRate : None or float
-            If `fQueryFunction == {'linear', 'quadratic', 'exponential'}`, rate
+            If `fQueryFunction == {'linear', 'quadratic'}`, rate of
             individual cost functions
 
         mQueryCost : float

{ltfmselector-0.2.0.dist-info → ltfmselector-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ltfmselector
-Version: 0.2.0
+Version: 0.2.1
 Summary: Locally-Tailored Feature and Model Selector with Deep Q-Learning
 Project-URL: GitHub, https://github.com/RenZhen95/ltfmselector/
 Author-email: RenZhen95 <j-liaw@hotmail.com>

ltfmselector-0.2.1.dist-info/RECORD

@@ -0,0 +1,9 @@
+ltfmselector/__init__.py,sha256=lf3e90CNpEDvEmNZ-0iuoHOPsA7D-WN_opbBsTYLVEA,76
+ltfmselector/env.py,sha256=F0NycqUkNn-p2zC1EPdds73__G8yyMW5f9F93yPDHTA,16371
+ltfmselector/ltfmselector.py,sha256=GdxazN6JG_ELZ7a7x6bbBCVDsgmdRWOsbi-TnRFNk8Y,32354
+ltfmselector/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ltfmselector/utils.py,sha256=VXYZSDm7x4s0p9F_58NLW8WQa3dxi0vHZewRy6miC2E,5438
+ltfmselector-0.2.1.dist-info/METADATA,sha256=mHEsAKWtYYsGOQyRxHX5f8fAaSXePDDklL_CLzMay9A,3020
+ltfmselector-0.2.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+ltfmselector-0.2.1.dist-info/licenses/LICENSE,sha256=tmIDlkkp4a0EudXuGmeTdGjHjPhmmXkEMshACXLqX2w,1092
+ltfmselector-0.2.1.dist-info/RECORD,,

ltfmselector-0.2.0.dist-info/RECORD

@@ -1,9 +0,0 @@
-ltfmselector/__init__.py,sha256=lf3e90CNpEDvEmNZ-0iuoHOPsA7D-WN_opbBsTYLVEA,76
-ltfmselector/env.py,sha256=898o_g6-i0Rz5R-4WxZInf3xaxXHf58kPJId0KeewQM,16070
-ltfmselector/ltfmselector.py,sha256=zxGTLtuaoqdWbGxM8JmQES1_kGpNad1utRfDkepPoko,32329
-ltfmselector/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ltfmselector/utils.py,sha256=VXYZSDm7x4s0p9F_58NLW8WQa3dxi0vHZewRy6miC2E,5438
-ltfmselector-0.2.0.dist-info/METADATA,sha256=76QDgOBLL81otMAwr9D-eNfviT5SY76Tf70-WNGIgyg,3020
-ltfmselector-0.2.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-ltfmselector-0.2.0.dist-info/licenses/LICENSE,sha256=tmIDlkkp4a0EudXuGmeTdGjHjPhmmXkEMshACXLqX2w,1092
-ltfmselector-0.2.0.dist-info/RECORD,,