Multirom

ezyrb/database.py

@@ -23,9 +23,14 @@ def __init__(self, parameters=None, snapshots=None):
         if parameters is None and snapshots is None:
             return
 
+        if parameters is None:
+            parameters = [None] * len(snapshots)
+        elif snapshots is None:
+            snapshots = [None] * len(parameters)
+
         if len(parameters) != len(snapshots):
             raise ValueError
-
+        
         for param, snap in zip(parameters, snapshots):
             self.add(Parameter(param), Snapshot(snap))
 
@@ -74,7 +79,9 @@ def __len__(self):
 
     def __str__(self):
         """ Print minimal info about the Database """
-        return str(self.parameters_matrix)
+        s = 'Database with {} snapshots and {} parameters'.format(
+            self.snapshots_matrix.shape[1], self.parameters_matrix.shape[1])
+        return s
 
     def add(self, parameter, snapshot):
         """

ezyrb/plugin/automatic_shift.py

@@ -132,8 +132,8 @@ def _train_shift_network(self, db):
 
             n_epoch += 1
 
-    def fom_preprocessing(self, rom):
-        db = rom._full_database
+    def fit_preprocessing(self, rom):
+        db = rom.database
 
         reference_snapshot = db._pairs[self.reference_index][1]
         self.reference_snapshot = reference_snapshot
@@ -154,11 +154,11 @@ def fom_preprocessing(self, rom):
             snap.values = self.interpolator.predict(
                 reference_snapshot.space.reshape(-1, 1)).flatten()
 
-    def fom_postprocessing(self, rom):
+    def predict_postprocessing(self, rom):
 
         ref_space = self.reference_snapshot.space
 
-        for param, snap in rom._full_database._pairs:
+        for param, snap in rom.predict_full_database._pairs:
             input_shift = np.hstack([
                 ref_space.reshape(-1, 1),
                 np.ones(shape=(ref_space.shape[0], 1))*param.values])

ezyrb/plugin/plugin.py

@@ -10,18 +10,53 @@ class Plugin(ABC):
     All the classes that implement the input-output mapping should be inherited
     from this class.
     """
-    def fom_preprocessing(self, rom):
+    def fit_preprocessing(self, rom):
         """ Void """
         pass
 
-    def rom_preprocessing(self, rom):
+    def fit_before_reduction(self, rom):
         """ Void """
         pass
 
-    def rom_postprocessing(self, rom):
+    def fit_after_reduction(self, rom):
+        """ Void """
+        pass
+
+    def fit_before_approximation(self, rom):
         """ Void """
         pass
 
-    def fom_postprocessing(self, rom):
+    def fit_after_approximation(self, rom):
         """ Void """
         pass
+
+    def fit_postprocessing(self, rom):
+        """ Void """
+        pass
+
+    def predict_preprocessing(self, rom):
+        """ Void """
+        pass
+
+    def predict_before_approximation(self, rom):
+        """ Void """
+        pass
+
+    def predict_after_approximation(self, rom):
+        """ Void """
+        pass
+
+    def predict_before_expansion(self, rom):
+        """ Void """
+        pass
+
+    def predict_after_expansion(self, rom):
+        """ Void """
+        pass
+
+    def predict_postprocessing(self, rom):
+        """ Void """
+        pass
+
+
+

ezyrb/plugin/shift.py

@@ -53,8 +53,8 @@ def __init__(self, shift_function, interpolator, parameter_index=0,
         self.parameter_index = parameter_index
         self.reference_index = reference_index
 
-    def fom_preprocessing(self, rom):
-        db = rom._full_database
+    def fit_preprocessing(self, rom):
+        db = rom.database
 
         reference_snapshot = db._pairs[self.reference_index][1]
 
@@ -68,10 +68,10 @@ def fom_preprocessing(self, rom):
             snap.values = self.interpolator.predict(
                 reference_snapshot.space.reshape(-1, 1)).flatten()
 
-        rom._full_database = db
+        rom.database = db
 
-    def fom_postprocessing(self, rom):
-        for param, snap in rom._full_database._pairs:
+    def predict_postprocessing(self, rom):
+        for param, snap in rom.predict_full_database._pairs:
             snap.space = (
                 rom.database._pairs[self.reference_index][1].space +
                 self.__shift_function(param.values)