oikan 0.0.3.6__py3-none-any.whl → 0.0.3.7__py3-none-any.whl

oikan/model.py

@@ -319,11 +319,15 @@ class OIKAN(ABC):
 
     def _generate_augmented_data(self, X):
         """Generates augmented data by adding Gaussian noise."""
+        if self.augmentation_factor == 1:
+            return np.array([]).reshape(0, X.shape[1])
+            
         X_aug = []
-        for _ in range(self.augmentation_factor):
+        for _ in range(self.augmentation_factor - 1):
             noise = np.random.normal(0, self.sigma, X.shape)
             X_perturbed = X + noise
             X_aug.append(X_perturbed)
+
         return np.vstack(X_aug)
 
     def _perform_symbolic_regression(self, X, y):
@@ -445,16 +449,31 @@ class OIKANRegressor(OIKAN):
         """
         X = np.asarray(X)
         y = np.asarray(y).reshape(-1, 1)
-        self._train_neural_net(X, y, output_size=1, loss_fn=nn.MSELoss())
-        if self.verbose:
-            print(f"Original data: features shape: {X.shape} | target shape: {y.shape}")
-        X_aug = self._generate_augmented_data(X)
-        self.neural_net.eval()
-        with torch.no_grad():
-            y_aug = self.neural_net(torch.tensor(X_aug, dtype=torch.float32)).detach().numpy()
-        if self.verbose:
-            print(f"Augmented data: features shape: {X_aug.shape} | target shape: {y_aug.shape}")
-        self._perform_symbolic_regression(X_aug, y_aug)
+        
+        if self.augmentation_factor > 1:
+            self._train_neural_net(X, y, output_size=1, loss_fn=nn.MSELoss())
+            
+            if self.verbose:
+                print(f"Original data: features shape: {X.shape} | target shape: {y.shape}")
+            
+            X_aug = self._generate_augmented_data(X)
+            
+            self.neural_net.eval()
+            with torch.no_grad():
+                y_aug = self.neural_net(torch.tensor(X_aug, dtype=torch.float32)).detach().numpy()
+            
+            if self.verbose:
+                print(f"Augmented data: features shape: {X_aug.shape} | target shape: {y_aug.shape}")
+            
+            X_combined = np.vstack([X, X_aug])
+            y_combined = np.vstack([y, y_aug])
+        else:
+            if self.verbose:
+                print("Skipping neural network training (augmentation_factor=1)")
+            X_combined = X
+            y_combined = y
+            
+        self._perform_symbolic_regression(X_combined, y_combined)
         if self.verbose:
             print("OIKANRegressor model training completed successfully!")
 
@@ -499,16 +518,31 @@ class OIKANClassifier(OIKAN):
         self.classes_ = le.classes_
         n_classes = len(self.classes_)
         y_onehot = nn.functional.one_hot(torch.tensor(y_encoded), num_classes=n_classes).float()
-        self._train_neural_net(X, y_onehot, output_size=n_classes, loss_fn=nn.CrossEntropyLoss())
-        if self.verbose:
-            print(f"Original data: features shape: {X.shape} | target shape: {y.shape}")
-        X_aug = self._generate_augmented_data(X)
-        self.neural_net.eval()
-        with torch.no_grad():
-            logits_aug = self.neural_net(torch.tensor(X_aug, dtype=torch.float32)).detach().numpy()
-        if self.verbose:
-            print(f"Augmented data: features shape: {X_aug.shape} | target shape: {logits_aug.shape}")
-        self._perform_symbolic_regression(X_aug, logits_aug)
+        
+        if self.augmentation_factor > 1:
+            self._train_neural_net(X, y_onehot, output_size=n_classes, loss_fn=nn.CrossEntropyLoss())
+            
+            if self.verbose:
+                print(f"Original data: features shape: {X.shape} | target shape: {y.shape}")
+            
+            X_aug = self._generate_augmented_data(X)
+            
+            self.neural_net.eval()
+            with torch.no_grad():
+                logits_aug = self.neural_net(torch.tensor(X_aug, dtype=torch.float32)).detach().numpy()
+            
+            if self.verbose:
+                print(f"Augmented data: features shape: {X_aug.shape} | target shape: {logits_aug.shape}")
+            
+            X_combined = np.vstack([X, X_aug])
+            y_combined = np.vstack([y_onehot.numpy(), logits_aug])
+        else:
+            if self.verbose:
+                print("Skipping neural network training (augmentation_factor=1)")
+            X_combined = X
+            y_combined = y_onehot.numpy()
+            
+        self._perform_symbolic_regression(X_combined, y_combined)
         if self.verbose:
             print("OIKANClassifier model training completed successfully!")
 

{oikan-0.0.3.6.dist-info → oikan-0.0.3.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oikan
-Version: 0.0.3.6
+Version: 0.0.3.7
 Summary: OIKAN: Neuro-Symbolic ML for Scientific Discovery
 Author: Arman Zhalgasbayev
 License: MIT

oikan-0.0.3.7.dist-info/RECORD

@@ -0,0 +1,10 @@
+oikan/__init__.py,sha256=zEzhm1GYLT4vNaIQ4CgZcNpUk3uo8SWnoaHYtHW_XSQ,628
+oikan/exceptions.py,sha256=GhHWqy2Q5LVBcteTy4ngnqxr7FOoLNyD8dNt1kfRXyw,901
+oikan/model.py,sha256=TC2-R00GOjFb7ePzKTqeYkOiVlqUK7KP0mXsnJhg9ik,24736
+oikan/neural.py,sha256=PZjaffSuABuCNxu-7PinU1GR6ji0Y6xRgSQ3n5HRDxI,1572
+oikan/utils.py,sha256=7UCm9obO-8Q2zhetdAkukMDOZvGSBWUL_dSF04XqM7k,8808
+oikan-0.0.3.7.dist-info/licenses/LICENSE,sha256=75ASVmU-XIpN-M4LbVmJ_ibgbzbvRLVti8FhnR0BTf8,1096
+oikan-0.0.3.7.dist-info/METADATA,sha256=nrel6O7TXdbtJHSNCzvqPq_IELeQWx0azfrU4Jq6sps,12749
+oikan-0.0.3.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+oikan-0.0.3.7.dist-info/top_level.txt,sha256=XwnwKwTJddZwIvtrUsAz-l-58BJRj6HjAGWrfYi_3QY,6
+oikan-0.0.3.7.dist-info/RECORD,,

oikan-0.0.3.6.dist-info/RECORD

@@ -1,10 +0,0 @@
-oikan/__init__.py,sha256=zEzhm1GYLT4vNaIQ4CgZcNpUk3uo8SWnoaHYtHW_XSQ,628
-oikan/exceptions.py,sha256=GhHWqy2Q5LVBcteTy4ngnqxr7FOoLNyD8dNt1kfRXyw,901
-oikan/model.py,sha256=vnn5THWhndj5-P2Vsa78CErsT24LVmjMd8CnWeW09Kg,23663
-oikan/neural.py,sha256=PZjaffSuABuCNxu-7PinU1GR6ji0Y6xRgSQ3n5HRDxI,1572
-oikan/utils.py,sha256=7UCm9obO-8Q2zhetdAkukMDOZvGSBWUL_dSF04XqM7k,8808
-oikan-0.0.3.6.dist-info/licenses/LICENSE,sha256=75ASVmU-XIpN-M4LbVmJ_ibgbzbvRLVti8FhnR0BTf8,1096
-oikan-0.0.3.6.dist-info/METADATA,sha256=P-07jTsmYsaANnQOjh_mzmjLk1Q9rqN665CBp_FKYjU,12749
-oikan-0.0.3.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-oikan-0.0.3.6.dist-info/top_level.txt,sha256=XwnwKwTJddZwIvtrUsAz-l-58BJRj6HjAGWrfYi_3QY,6
-oikan-0.0.3.6.dist-info/RECORD,,