pyeggp 1.0.0__tar.gz → 1.0.2__tar.gz

{pyeggp-1.0.0 → pyeggp-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyeggp
-Version: 1.0.0
+Version: 1.0.2
 Summary: Python Wheels for eggp algorithm.
 Author-email: Fabricio Olivetti <folivetti@users.noreply.github.com>
 License:                     GNU GENERAL PUBLIC LICENSE

{pyeggp-1.0.0 → pyeggp-1.0.2}/pyproject.toml

@@ -12,7 +12,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyeggp"
-version = "1.0.0"
+version = "1.0.2"
 authors = [{ name = "Fabricio Olivetti", email = "folivetti@users.noreply.github.com" }]
 description = "Python Wheels for eggp algorithm."
 readme = "README.md"

{pyeggp-1.0.0 → pyeggp-1.0.2}/src/pyeggp/__init__.py

@@ -96,14 +96,54 @@ class PyEGGP(BaseEstimator, RegressorMixin):
             self.is_fitted_ = True
         return self
 
+    def fit_mvsr(self, Xs, ys):
+        if Xs[0].ndim == 1:
+            Xs = [X.reshape(-1,1) for X in Xs]
+        ys = [y.reshape(-1, 1) for y in ys]
+        combineds = [np.hstack([X, y]) for X, y in zip(Xs, ys)]
+        header = [f"x{i}" for i in range(Xs[0].shape[1])] + ["y"]
+        datasets = []
+        for combined in combineds:
+            with tempfile.NamedTemporaryFile(mode='w+', newline='', delete=False, suffix='.csv') as temp_file:
+                writer = csv.writer(temp_file)
+                writer.writerow(header)
+                writer.writerows(combined)
+                datasets.append(temp_file.name)
+
+        csv_data = pyeggp_run(" ".join(datasets), self.gen, self.nPop, self.maxSize, self.nTournament, self.pc, self.pm, self.nonterminals, self.loss, self.optIter, self.optRepeat, self.nParams, self.split, self.simplify, self.dumpTo, self.loadFrom)
+        if len(csv_data) > 0:
+            csv_io = StringIO(csv_data.strip())
+            self.results = pd.read_csv(csv_io, header=0, dtype={'theta':str})
+            self.is_fitted_ = True
+        return self
+
     def predict(self, X):
         check_is_fitted(self)
-        return self.evaluate_best_model(self.model_, X)
+        return self.evaluate_best_model(X)
+
+    def predict_mvsr(self, X, view):
+        check_is_fitted(self)
+        return self.evaluate_best_model_view(X, view)
+
     def evaluate_best_model(self, x):
         if x.ndim == 1:
             x = x.reshape(-1,1)
         t = np.array(list(map(float, self.results.iloc[-1].theta.split(";"))))
         return eval(self.results.iloc[-1].Numpy)
+    def evaluate_best_model_view(self, x, view):
+        if x.ndim == 1:
+            x = x.reshape(-1,1)
+        ix = self.results.iloc[-1].id
+        best = self.results[self.results.id==ix].iloc[view]
+        t = np.array(list(map(float, best.theta.split(";"))))
+        return eval(best.Numpy)
+
+    def evaluate_model_view(self, x, ix, view):
+        if x.ndim == 1:
+            x = x.reshape(-1,1)
+        best = self.results[self.results.id==ix].iloc[view]
+        t = np.array(list(map(float, best.theta.split(";"))))
+        return eval(best.Numpy)
     def evaluate_model(self, ix, x):
         if x.ndim == 1:
             x = x.reshape(-1,1)

{pyeggp-1.0.0 → pyeggp-1.0.2}/src/pyeggp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyeggp
-Version: 1.0.0
+Version: 1.0.2
 Summary: Python Wheels for eggp algorithm.
 Author-email: Fabricio Olivetti <folivetti@users.noreply.github.com>
 License:                     GNU GENERAL PUBLIC LICENSE

{pyeggp-1.0.0 → pyeggp-1.0.2}/test/test_pyeggp.py

@@ -5,6 +5,10 @@ output = pyeggp_run("test/data.csv", 100, 100, 10, 3, 0.9, 0.3, "add,sub,mul,div
 
 print(output)
 
+output = pyeggp_run("test/data.csv test/data2.csv", 100, 100, 10, 3, 0.9, 0.3, "add,sub,mul,div,log", "MSE", 50, 2, -1, 3, 0, "", "")
+
+print(output)
+
 print("Check PyEGGP")
 df = pd.read_csv("test/data.csv")
 Z = df.values
@@ -14,3 +18,8 @@ y = Z[:,-1]
 reg = PyEGGP(100, 100, 10, 3, 0.9, 0.3, "add,sub,mul,div,log", "MSE", 50, 2, -1, 3, 0, "", "")
 reg.fit(X, y)
 print(reg.score(X, y))
+
+reg.fit_mvsr([X,X],[y,y])
+print(reg.predict_mvsr(X,0))
+print(reg.predict_mvsr(X,1))
+print(reg.results)