operation naming

whatsopt · Jan 4, 2020 · 3fa4471 · 3fa4471
1 parent 0a8ccd1
commit 3fa4471
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/app/controllers/meta_models_controller.rb b/app/controllers/meta_models_controller.rb
@@ -8,12 +8,13 @@ def create
     authorize mda
     if mda.save
       driver = get_driver_from_metamodel_kind(meta_model_params[:kind])
+      name = get_name_from_metamodel_kind(meta_model_params[:kind])
       vars = []
       unless meta_model_params[:variables].blank?
         vars = meta_model_params[:variables][:inputs] + meta_model_params[:variables][:outputs]
       end
       mm_doe = ope.build_copy(mda, vars)
-      mm_ope = Operation.build_operation(mda, name: "metamodel", driver: driver)
+      mm_ope = Operation.build_operation(mda, name: name, driver: driver)
       mm_ope.base_operation = mm_doe
       mm_ope.save!
       mda.set_all_parameters_as_design_variables
@@ -38,9 +39,18 @@ def meta_model_params
     end
 
     def get_driver_from_metamodel_kind(kind)
+      library, algo = get_infos_from_metamodel_kind(kind)
+      "#{library}_metamodel_#{algo}"
+    end
+
+    def get_name_from_metamodel_kind(kind)
+      library, algo = get_infos_from_metamodel_kind(kind)
+      "Metamodel #{algo}"
+    end
+
+    def get_infos_from_metamodel_kind(kind)
       kind = kind.downcase
       kind =~ /(\w+)_(\w+)/
-      library, algo = $1, $2
-      "#{library}_metamodel_#{algo}"
+      return $1, $2
     end
 end
diff --git a/app/models/operation.rb b/app/models/operation.rb
@@ -78,7 +78,7 @@ def build_derived_operations
       if self.driver =~ /(\w+)_doe_(\w+)/
         library = $1
         algo = $2
-        derived = self.derived_operations.build(name: "#{library}_sensitivity_#{algo}", 
+        derived = self.derived_operations.build(name: "Sensitivity(#{algo})", 
                                                 driver: "#{library}_sensitivity_#{algo}",
                                                 analysis_id: self.analysis_id)
         derived.build_job(status: "ASSUME_DONE")
@@ -89,7 +89,7 @@ def build_derived_operations
       if self.driver =~ /(openturns)_metamodel_(pce)/
         library = $1
         algo = $2
-        derived = self.derived_operations.build(name: "#{library}_sensitivity_#{algo}", 
+        derived = self.derived_operations.build(name: "Sensitivity(#{algo})", 
                                                 driver: "#{library}_sensitivity_#{algo}",
                                                 analysis_id: self.analysis_id)
         derived.build_job(status: "ASSUME_DONE")