StackGP 0.0.10__tar.gz → 0.0.12__tar.gz

{stackgp-0.0.10 → stackgp-0.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: StackGP
-Version: 0.0.10
+Version: 0.0.12
 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.10 → stackgp-0.0.12}/StackGP/StackGP.py

@@ -812,8 +812,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 +832,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.10 → stackgp-0.0.12}/StackGP.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: StackGP
-Version: 0.0.10
+Version: 0.0.12
 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.10 → stackgp-0.0.12}/pyproject.toml

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