pyeggp 1.0.0__cp310-cp310-macosx_14_0_arm64.whl → 1.0.1__cp310-cp310-macosx_14_0_arm64.whl

pyeggp/__init__.py

@@ -96,14 +96,53 @@ 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.dist-info → pyeggp-1.0.1.dist-info}/METADATA

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

{pyeggp-1.0.0.dist-info → pyeggp-1.0.1.dist-info}/RECORD

@@ -1,15 +1,15 @@
-pyeggp/__init__.py,sha256=S4KjoS28x9S5Zle2kLt_RCZ92WY2PZN5WsoWu095llc,4019
+pyeggp-1.0.1.dist-info/RECORD,,
+pyeggp-1.0.1.dist-info/WHEEL,sha256=Fvphz92IRlGJZ3kKS7pknSosU5_kkb5AV_S3x4jC_J8,109
+pyeggp-1.0.1.dist-info/entry_points.txt,sha256=NJouaQ2UoCLBu7Toqer0FBvNSDYMawR_Wx9STMdopyY,48
+pyeggp-1.0.1.dist-info/top_level.txt,sha256=iLrWfWZHh4NruYDgVyn2ntEB-uJ8fIs95nzNVLIhKE4,7
+pyeggp-1.0.1.dist-info/METADATA,sha256=vbigkLKhJ_sSORsiKsZkFnU-Mjs8jOSN4Rj7gypQbtU,42220
+pyeggp-1.0.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pyeggp/__init__.py,sha256=rzgGMRTJwRU0BDhfUCcE1G0OvFwu3o0qcjTfTRV7q54,5774
 pyeggp/_binding.pyi,sha256=TsI8Gar1wpDs3c8V26i3w_u1JjznlE5dReV59bbVUh0,460
-pyeggp/_binding.cpython-310-darwin.so,sha256=7qRJbrhy9bU0CZ-6gaKS7nw7kjh0oSludOOwhW6pI7k,48557936
+pyeggp/_binding.cpython-310-darwin.so,sha256=FNuWocHw2MWu87hIXP5_-P-mR5YUeyzW0x_pNlFLijc,48557936
 pyeggp/binding.i,sha256=AdPEymjqByW6OhpJS08o2oTc7Go3-274JqRhbXoyDjg,1908
 pyeggp/_binding.py,sha256=a7A4MeQiCK6iVq0LIiGUiD_b0Kw7Qj8MMVTBA4f25zc,580
 pyeggp/typing.py,sha256=qr1vWstl5HiaUT5HGsQFHO4pRq4EhqEc4zG2mn9QHgc,517
 pyeggp/binding.py,sha256=8PjUmL-TO2k9M1uUdT8hriWKUdTUfqMgXnpcwWklayk,2625
 pyeggp/__main__.py,sha256=dAMEebAw-mVcR5PUffuRsUDPFm6Vf4qvaam9TPSUs0I,155
 pyeggp/.dylibs/libnlopt.1.0.0.dylib,sha256=Tq5lixYXekOwOCwz3yxVXUsAQkMn8whIbV4f1qK2rFA,447840
-pyeggp-1.0.0.dist-info/RECORD,,
-pyeggp-1.0.0.dist-info/WHEEL,sha256=Fvphz92IRlGJZ3kKS7pknSosU5_kkb5AV_S3x4jC_J8,109
-pyeggp-1.0.0.dist-info/entry_points.txt,sha256=NJouaQ2UoCLBu7Toqer0FBvNSDYMawR_Wx9STMdopyY,48
-pyeggp-1.0.0.dist-info/top_level.txt,sha256=iLrWfWZHh4NruYDgVyn2ntEB-uJ8fIs95nzNVLIhKE4,7
-pyeggp-1.0.0.dist-info/METADATA,sha256=4z00OKGfxeNOFYIrfF4bipPgArl2otXNGJaKpDudor0,42220
-pyeggp-1.0.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149