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

pyeggp/__init__.py

@@ -107,14 +107,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}/DELVEWHEEL

@@ -1,2 +1,2 @@
 Version: 1.10.0
-Arguments: ['C:\\hostedtoolcache\\windows\\Python\\3.12.9\\x64\\Scripts\\delvewheel', 'repair', '-w', 'C:\\Users\\runneradmin\\AppData\\Local\\Temp\\cibw-run-08n10a1r\\cp310-win_amd64\\repaired_wheel', 'C:\\Users\\runneradmin\\AppData\\Local\\Temp\\cibw-run-08n10a1r\\cp310-win_amd64\\built_wheel\\pyeggp-1.0.0-cp310-cp310-win_amd64.whl', '--add-path', 'C:\\nlopt\\bin']
+Arguments: ['C:\\hostedtoolcache\\windows\\Python\\3.12.9\\x64\\Scripts\\delvewheel', 'repair', '-w', 'C:\\Users\\runneradmin\\AppData\\Local\\Temp\\cibw-run-zhyu2oli\\cp310-win_amd64\\repaired_wheel', 'C:\\Users\\runneradmin\\AppData\\Local\\Temp\\cibw-run-zhyu2oli\\cp310-win_amd64\\built_wheel\\pyeggp-1.0.1-cp310-cp310-win_amd64.whl', '--add-path', 'C:\\nlopt\\bin']

{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,19 +1,19 @@
 pyeggp/binding.i,sha256=UvqL1SWs47LNCpgN3F6l3oufPvwaqUzdHpk0cEZQa5M,1972
 pyeggp/binding.py,sha256=EhVDh4fL2Zs7erIc8YmMq8Z3VW256E2dkKdPpaprMq8,2701
 pyeggp/typing.py,sha256=aVUeV85Ig86cccHbyV1KDWjp_ioTl6z3omPA2ZPk0-4,531
-pyeggp/_binding.cp310-win_amd64.pyd,sha256=MXh_Wr01gPgQQe_n_LBg14HKoI2Rmh0l2o92zcUcv6U,40247296
+pyeggp/_binding.cp310-win_amd64.pyd,sha256=3oUXA-6iY_K4s3bQcyRWHn51GUbu1kqYNlRccc5iWK4,40247296
 pyeggp/_binding.py,sha256=hCATypEr6IcQgGrz3TqFzOQ0gZKsqU5CL4UcyI3M6_Y,598
 pyeggp/_binding.pyi,sha256=tLpel6vl4zZ_mftC6zVaWVfV2zhVxDLIZpFQ3cisgH4,467
-pyeggp/__init__.py,sha256=aHV3duS7GP9P-CVgC0zyz5Vqk-rZXBfoNlfeQ-0E3j8,4461
+pyeggp/__init__.py,sha256=SqZfmavLzkYXhY2ZZpc46WxrlZrw17e4ovPu5NtHgTc,6255
 pyeggp/__main__.py,sha256=b5xBNv5E7XRE2a2cCHvSYQvDTJ7i6SR2JuAvstvEaFE,166
-pyeggp-1.0.0.dist-info/DELVEWHEEL,sha256=DxdpCLZK4YKm-fuL4CrdALo4TMUPBSffX5JGWU9muE4,387
-pyeggp-1.0.0.dist-info/entry_points.txt,sha256=NJouaQ2UoCLBu7Toqer0FBvNSDYMawR_Wx9STMdopyY,48
-pyeggp-1.0.0.dist-info/METADATA,sha256=oJ8qCRB30pjV-qfOHr3WGv4nuIYNCtyv48ADJQEcKU8,42930
-pyeggp-1.0.0.dist-info/RECORD,,
-pyeggp-1.0.0.dist-info/top_level.txt,sha256=iLrWfWZHh4NruYDgVyn2ntEB-uJ8fIs95nzNVLIhKE4,7
-pyeggp-1.0.0.dist-info/WHEEL,sha256=xtqxYTqke_XhXNhgwydvlroVayIzBVjJDMBpIgge99s,101
-pyeggp-1.0.0.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+pyeggp-1.0.1.dist-info/DELVEWHEEL,sha256=3TUjZ-fFqOC3Xz2XrOZpdUWka0t9SPGrsDkhR44p3-8,387
+pyeggp-1.0.1.dist-info/entry_points.txt,sha256=NJouaQ2UoCLBu7Toqer0FBvNSDYMawR_Wx9STMdopyY,48
+pyeggp-1.0.1.dist-info/METADATA,sha256=wfKNMJ1kKfJART80WinVVLyFK2VbIzruzoFw4mkpDHs,42930
+pyeggp-1.0.1.dist-info/RECORD,,
+pyeggp-1.0.1.dist-info/top_level.txt,sha256=iLrWfWZHh4NruYDgVyn2ntEB-uJ8fIs95nzNVLIhKE4,7
+pyeggp-1.0.1.dist-info/WHEEL,sha256=xtqxYTqke_XhXNhgwydvlroVayIzBVjJDMBpIgge99s,101
+pyeggp-1.0.1.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
 pyeggp.libs/libgcc_s_seh-1-c7e71e753d95ee0b157469f5daa29a03.dll,sha256=OaympRU538qibFmFvn4Gt-RCKJiOQeGMApqEFl7_fKY,101376
-pyeggp.libs/libnlopt-3a904c117411120733a50f72774207d3.dll,sha256=StQslv47yH5idXgBfe2DOcXgzH3Y5uPFBFuzeNUgk6E,749190
+pyeggp.libs/libnlopt-b2a417291a17d7165e68e732209d21b7.dll,sha256=QvUMosCR0lNzg2Y5aRnDAI3AzCT4Xw_9tU7swrKkRa8,749190
 pyeggp.libs/libstdc++-6-a07611cfa5f65b02dbc1ace58f4dc030.dll,sha256=F4uaDJoJUOIf4DY3GuDR8SWay0W_LEel8SY8zJYod-k,2020352
 pyeggp.libs/libwinpthread-1-2db4a17751d27a5781b70c35799daa95.dll,sha256=4BuOhf1nwrhh9k1MzH32B1m1iapBAACij6K4SiCJF1s,54784