Merge pull request #14 from djpasseyjr/icmap

activ_f

Author: djpasseyjr

rescomp/ResComp.py

@@ -231,8 +231,10 @@ def initial_condition(self, u0):
                 This typically conincided with the fixed point above but unlike the nonlinear solver, this method
                 always converged.
             "activ_f"
-                This sets the reservoir initial condition to r0 = activ_f(W_in @ u0). Incidentally, should send
+                This sets the reservoir initial condition to r0 = activ_f(sigma * W_in @ u0). Incidentally, should send
                 the reservoir initial condition close to the attracting fixed points of the system
+            "activ_f_unscaled"
+                This sets the reservoir initial condition to r0 = activ_f(sigma * W_in @ u0). Included for legacy reasons.
             "pseudoinverse"
                 Only for use after training. This uses the pseudoinverse of W_out to compute the initial node
                 state from an inital condition from the learned system
@@ -255,6 +257,8 @@ def initial_condition(self, u0):
             if  err > 1e-12:
                 warn(f"Reservoir fixed point failed to converge. ||r_n - r_(n+1)|| = {err}")
         elif self.map_initial == "activ_f":
+            r0 = self.activ_f(self.W_in @ (self.sigma * u0))
+        elif self.map_initial == "activ_f_unscaled":
             r0 = self.activ_f(self.W_in @ u0)
         elif self.map_initial == "pseudoinverse":
             if not self.is_trained:

rescomp/optimizer/__init__.py

@@ -7,5 +7,5 @@
 
 from .optimizer_controller import ResCompOptimizer
 from .optimizer_functions import *
-from .optimizer_systems import get_res_defaults, load_from_file, loadprior, get_system
+from .optimizer_systems import get_res_defaults, load_from_file, loadprior, get_system, ChaosODESystem, SoftRobotSystem
 from .templates import random_slice, System

rescomp/optimizer/optimizer_systems.py

@@ -117,12 +117,15 @@ def _clean_prior(prior):
 # Predefined systems
 #####################
 
-def get_system(system_name):
+def get_system(system_name, **kwargs):
     """
     Gets the system with the given name.
     If system_name is one of 'lorenz', 'thomas', 'rossler', or 'softrobot', uses the predefined system object.
     Otherwise, attempts to load a file.
     
+    For 'lorenz', 'thomas', 'rossler', and 'softrobot', the train_time, test_time, and dt parameters can be
+    specified as  keyword arguments.
+    
     Returns a rescomp.optimizer.System object
     """
 
@@ -131,12 +134,23 @@ def get_system(system_name):
     #   -test time
     #   -dt
     if system_name == 'lorenz':
-        return ChaosODESystem('lorenz', 6.6, 8, 0.01)
+        params = {'train_time':6.6, 'test_time':8., 'dt':0.01}
+        params = {**params, **kwargs}
+        return ChaosODESystem('lorenz', **params)
+    
     elif system_name == 'rossler':
-        return ChaosODESystem('rossler', 165, 120, 0.01)
+        params = {'train_time':165, 'test_time':120, 'dt':0.01}
+        params = {**params, **kwargs}
+        return ChaosODESystem('rossler', **params)
+    
     elif system_name == 'thomas':
-        return ChaosODESystem('thomas', 660, 360, 0.1)
+        params = {'train_time':660, 'test_time':360, 'dt':0.1}
+        params = {**params, **kwargs}
+        return ChaosODESystem('thomas', **params)
+    
     elif system_name == 'softrobot':
+        params = {'train_time':165, 'test_time':80, 'dt':0.01}
+        params = {**params, **kwargs}
         return SoftRobotSystem(165, 80, 0.01)
     else:
         try: