StackGP 0.0.11__tar.gz → 0.0.13__tar.gz

{stackgp-0.0.11 → stackgp-0.0.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: StackGP
-Version: 0.0.11
+Version: 0.0.13
 Summary: A stack-based genetic programming system
 Author-email: Nathan Haut <hautnath@msu.edu>
 Project-URL: Homepage, https://github.com/hoolagans/StackGP

{stackgp-0.0.11 → stackgp-0.0.13}/StackGP/StackGP.py

@@ -576,16 +576,18 @@ removeIndeterminateModels.__doc__ = "removeIndeterminateModels(models) removes m
 def sortModels(models):
     return sorted(models, key=lambda m:m[2])
 sortModels.__doc__ = "sortModels(models) sorts a model population by the models' accuracies"
-def selectModels(models, selectionSize=0.5):
+def selectModels(models, selectionSize=0.5, thresholds=None):
     tMods=copy.deepcopy(models)
     [modelToListForm(mod) for mod in tMods]
+    if thresholds is not None:
+        tMods=[mod for mod in tMods if all([mod[2][i]<=thresholds[i] for i in range(len(thresholds))])]
     paretoModels=[]
     if selectionSize<=1:
         selection=selectionSize*len(models)
     else:
         selection=selectionSize
     
-    while len(paretoModels)<selection:
+    while len(paretoModels)<selection and len(tMods)>0:
         front=paretoTournament(tMods)
         paretoModels=paretoModels+front
         for i in front:
@@ -812,8 +814,19 @@ def uncertainty(data,trim=0.3):
         return h
     else:
         return 0
-    
+
 def evaluateModelEnsemble(ensemble, inputData):
+    responses=[evaluateGPModel(mod, inputData) for mod in ensemble]
+    if type(responses[0])==np.ndarray:
+        responses=np.transpose(responses)
+        predictions=[np.median(res) for res in responses]
+    else:
+        
+        predictions=[np.median(responses)]
+    
+    return predictions
+    
+def evaluateModelEnsembleUncertainty(ensemble, inputData):
     responses=[evaluateGPModel(mod, inputData) for mod in ensemble]
     if type(responses[0])==np.ndarray:
         responses=np.transpose(responses)
@@ -821,10 +834,10 @@ def evaluateModelEnsemble(ensemble, inputData):
     else:
         
         uncertainties=[uncertainty(responses,0)]
-    
     return uncertainties
+
 def relativeEnsembleUncertainty(ensemble,inputData):
-    output=evaluateModelEnsemble(ensemble,inputData)
+    output=evaluateModelEnsembleUncertainty(ensemble,inputData)
     return np.array(output)
     
 def createUncertaintyFunc(ensemble):

{stackgp-0.0.11 → stackgp-0.0.13}/StackGP.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: StackGP
-Version: 0.0.11
+Version: 0.0.13
 Summary: A stack-based genetic programming system
 Author-email: Nathan Haut <hautnath@msu.edu>
 Project-URL: Homepage, https://github.com/hoolagans/StackGP

{stackgp-0.0.11 → stackgp-0.0.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "StackGP"
-version = "0.0.11"
+version = "0.0.13"
 authors = [
   { name="Nathan Haut", email="hautnath@msu.edu" },
 ]