mm show ok

app/lib/whats_opt/salib_sensitivity_analyser.rb

@@ -10,8 +10,8 @@ def initialize(ope, kind: :morris)
       @sobol = (kind == :sobol) 
       @input_varcases = ope.input_cases
       @output_varcases = ope.output_cases
-      Rails.logger.info @input_varcases.map(&:float_varname)
-      Rails.logger.info @output_varcases.map(&:float_varname)
+      Rails.logger.info @input_varcases.map(&:var_label)
+      Rails.logger.info @output_varcases.map(&:var_label)
     end
 
     def run

app/lib/whats_opt/templates/run_sensitivity_analysis.py.erb

@@ -16,7 +16,7 @@ lower = []
 upper = []
 inputs = []
 <% @input_varcases.each do |vc| %>
-names.append("<%= vc.float_varname %>")
+names.append("<%= vc.var_label %>")
 inputs.append(np.array(<%= vc.values %>))
 <% end %>
 #bounds = zip(lower, upper)
@@ -32,8 +32,8 @@ salib_pb = {
 result = {}
 
 <% @output_varcases.each do |vc| %>
-# <%= vc.float_varname %>
-outname = '<%= vc.float_varname %>'
+# <%= vc.var_label %>
+outname = '<%= vc.var_label %>'
 result[outname] = {}
 output = np.array(<%= vc.values %>)
 <% if @sobol %>

app/models/case.rb

@@ -15,15 +15,11 @@ def nb_of_points
     values.size
   end
 
-  def float_varname
-    label
+  def var_label
+    @label ||= Case.label(variable.name, coord_index) 
   end
 
-  def label
-    @label ||= Case.labelOf(variable.name, coord_index) 
-  end
-
-  def self.labelOf(name, coord)
+  def self.label(name, coord)
     name + (coord < 0 ? "" : "[#{coord}]")
   end
 

app/models/meta_model.rb

@@ -56,9 +56,11 @@ def is_prototype?
 
   def build_surrogates
     opts = default_options.map {|o| {name: o[:name], value: o[:value]}}
+    # At build time, a meta_model is in a "metamodel prototype" analysis by construction
     analysis.response_variables.each do |v|
       (0...v.dim).each do |index|
-        surrogates.build(variable: v, coord_index: index-1, kind: default_surrogate_kind, options_attributes: opts)
+        surrogates.build(variable: v, coord_index: v.ndim == 0 ? -1 : index, 
+          kind: default_surrogate_kind, options_attributes: opts)
       end
     end
   end
@@ -109,11 +111,22 @@ def predict(values)
     end
     res
   rescue => e
+    Rails.logger.warn "METAMODEL in ##{analysis.id} #{analysis.name}: Cannot make prediction for #{values}, error: #{e}"
     raise PredictionError.new("Cannot make prediction for #{values}, error: #{e}")
   end
 
   def training_input_names
-    @training_input_names ||= operation.input_cases.map { |c| c.label }
+    @training_input_names ||= operation.input_cases.map { |c| c.var_label }
+  end
+
+  def xlabels
+    analysis.input_variables.map do |v| 
+      (0...v.dim).map{ |i| Case.label(v.name, v.ndim == 0 ? -1 : i) } 
+    end.flatten
+  end
+
+  def ylabels
+    self.surrogates.map(&:var_label)
   end
 
   def training_input_uncertainties
@@ -124,7 +137,7 @@ def training_input_uncertainties
   end
 
   def training_input_values
-    @training_inputs ||= Matrix.columns(operation.input_cases.sort_by { |c| c.label }.map(&:values)).to_a
+    @training_inputs ||= Matrix.columns(operation.input_cases.sort_by { |c| c.var_label }.map(&:values)).to_a
   end
 
   def training_output_values(varname, coord_index)

app/models/operation.rb

@@ -202,7 +202,7 @@ def update_operation(ope_attrs)
   end
 
   def _ope_cases
-    @ope_cases ||= base_operation ? base_operation._ope_cases : cases.sort_by{|c| c.label}
+    @ope_cases ||= base_operation ? base_operation._ope_cases : cases.sort_by{|c| c.var_label}
   end
 
   def input_cases

app/models/surrogate.rb

@@ -49,8 +49,8 @@ def proxy
     WhatsOpt::SurrogateProxy.new(id: id.to_s)
   end
 
-  def float_varname
-    variable.name + (coord_index < 0 ? "" : "[#{coord_index}]")
+  def var_label
+    Case.label(variable.name, coord_index)
   end
 
   def trained?

app/serializers/meta_model_serializer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class MetaModelSerializer < ActiveModel::Serializer
-  attributes :id, :name, :owner_email, :created_at, :note
+  attributes :id, :name, :owner_email, :created_at, :note, :xlabels, :ylabels
 
   def name 
     object.analysis.name
@@ -15,7 +15,11 @@ def note
     object.analysis.note
   end
 
-  # def x
-  #   object.surrogates.map{ |surr| surr.}
-  # end
+  def xlabels
+    object.xlabels
+  end
+
+  def ylabels 
+    object.ylabels
+  end
 end

test/controllers/api/v1/meta_models_controller_test.rb

@@ -45,7 +45,9 @@ class Api::V1::MetaModelsControllerTest < ActionDispatch::IntegrationTest
     get api_v1_meta_model_url(mm), as: :json, headers: @auth_headers
     assert_response :success
     mminfos = JSON.parse(response.body)
-    assert_equal ["created_at", "id", "name", "note", "owner_email"], mminfos.keys.sort 
+    assert_equal ["created_at", "id", "name", "note", "owner_email", "xlabels", "ylabels"], mminfos.keys.sort 
+    assert_equal ["x1", "z[0]", "z[1]"], mminfos["xlabels"] 
+    assert_equal ["obj"], mminfos["ylabels"] 
   end
 
   test "should create a metamodel" do