StackGP 0.0.14__tar.gz → 0.0.15__tar.gz

{stackgp-0.0.14 → stackgp-0.0.15}/PKG-INFO

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

@@ -24,6 +24,7 @@ try:
     from IPython.display import display, clear_output
 except:
     pass
+
 import signal #for timing out functions
 from contextlib import contextmanager #for timing out functions
 
@@ -63,6 +64,8 @@ def sqrd(a):
     return a**2
 def inv(a):
     return np.array(a).astype(float)**(-1)
+def neg(a):
+    return -a
 def sin(a):
     return np.sin(a)
 def cos(a):
@@ -79,6 +82,12 @@ def tanh(a):
     return np.tanh(a)
 def log(a):
     return np.log(a)
+def log10(a):
+    return np.log10(a)
+def log2(a):
+    return np.log2(a)
+def abs1(a):
+    return np.abs(a)
 
 def and1(a,b):
     return np.logical_and(a,b)
@@ -97,9 +106,9 @@ def not1(a):
 
 
 def defaultOps():
-    return [protectDiv,add,sub,mult,exp,sqrd,sqrt,inv,"pop","pop","pop","pop","pop","pop"]
+    return [protectDiv,add,sub,mult,exp,sqrd,sqrt,inv,neg,"pop","pop","pop","pop","pop","pop"]
 def allOps():
-    return [protectDiv,add,sub,mult,exp,sqrd,sqrt,inv,cos,sin,tan,arccos,arcsin,arctan,tanh,log,"pop","pop","pop","pop","pop","pop","pop","pop","pop","pop"]
+    return [protectDiv,add,sub,mult,exp,sqrd,sqrt,inv,neg,cos,sin,tan,arccos,arcsin,arctan,tanh,log,"pop","pop","pop","pop","pop","pop","pop","pop","pop","pop"]
 def booleanOps():
     return [and1,or1,xor1,nand1,nor1,xnor1,not1,"pop","pop","pop","pop","pop","pop","pop"]
 def randomInt(a=-3,b=3):
@@ -814,7 +823,10 @@ def printGPModel(mod,inputData=symbols(["x"+str(i) for i in range(100)])): #Eval
     model[0] = replaceFunc(model[0],arctan,atan)
     model[0] = replaceFunc(model[0],tanh,tanh1)
     model[0] = replaceFunc(model[0],log,log2)
-    response=evModHelper(model[1],model[0],[],np.array(inputData))[2][0]
+    try:
+        response=evModHelper(model[1],model[0],[],np.array(inputData))[2][0]
+    except:
+        return np.nan
     return response
 
 def ensembleSelect(models, inputData, responseData, numberOfClusters=10): #Generates a model ensemble using input data partitions

{stackgp-0.0.14 → stackgp-0.0.15}/StackGP.egg-info/PKG-INFO

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

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