update mongoid queries

local_setup_scripts/rebuild_sr.sh

@@ -6,7 +6,7 @@ sleep 5
 docker volume rm -f osdata || true
 docker volume rm -f dbdata || true
 docker image rm 127.0.0.1:5000/openstudio-server -f
-docker build . -t="127.0.0.1:5000/openstudio-server" --build-arg OPENSTUDIO_VERSION=3.2.0
+docker build . -t="127.0.0.1:5000/openstudio-server" --build-arg OPENSTUDIO_VERSION=3.4.0
 docker push 127.0.0.1:5000/openstudio-server
 cd docker/R/
 #docker image rm 127.0.0.1:5000/openstudio-rserve -f

local_setup_scripts/win64/rebuild_sr.sh

@@ -6,7 +6,7 @@ sleep 5
 docker volume rm -f osdata || true
 docker volume rm -f dbdata || true
 docker image rm 127.0.0.1:5000/openstudio-server -f
-docker build . -t="127.0.0.1:5000/openstudio-server" --build-arg OPENSTUDIO_VERSION=3.2.0
+docker build . -t="127.0.0.1:5000/openstudio-server" --build-arg OPENSTUDIO_VERSION=3.4.0
 docker push 127.0.0.1:5000/openstudio-server
 cd docker/R
 #docker image rm 127.0.0.1:5000/openstudio-rserve -f

local_setup_scripts/win64/rebuild_sr_no_rm.sh

@@ -6,7 +6,7 @@ sleep 5
 docker volume rm -f osdata || true
 docker volume rm -f dbdata || true
 #docker image rm 127.0.0.1:5000/openstudio-server -f
-docker build . -t="127.0.0.1:5000/openstudio-server" --build-arg OPENSTUDIO_VERSION=3.2.0
+docker build . -t="127.0.0.1:5000/openstudio-server" --build-arg OPENSTUDIO_VERSION=3.4.0
 docker push 127.0.0.1:5000/openstudio-server
 cd docker/R
 #docker image rm 127.0.0.1:5000/openstudio-rserve -f

server/app/assets/stylesheets/main.css.scss

@@ -384,6 +384,10 @@ h2.header-large {
   }
 }
 
+.sig-fig {
+  padding-top: 5px;
+}
+
 //remove this if you want traditional pagination
 .pagination {
   background: #f9f9f9;

server/app/controllers/analyses_controller.rb

@@ -63,12 +63,18 @@ def index
   # GET /analyses/1
   # GET /analyses/1.json
   def show
-    logger.info "analyses_contoller.show enter"
+    logger.info "analyses_controller.show enter"
     # for pagination
     per_page = 50
 
     @analysis = Analysis.find(params[:id])
 
+    if params[:commit] && params[:commit] == 'Update'
+      # update # of significant digits
+      @analysis.significant_digits = params[:significant_digits].to_i
+      @analysis.save!
+    end
+
     if @analysis
 
       @has_obj_targets = @analysis.variables.where(:objective_function_target.ne => nil).count > 0
@@ -78,7 +84,7 @@ def show
       unless params[:status].nil?
         @status = params[:status]
       end
-
+      
       # blanks should be saved as nil or it will crash
       @all_page = @status == 'all' ? params[:page] : params[:all_page]
       @all_page = @all_page == '' ? 1 : @all_page
@@ -136,7 +142,7 @@ def show
       format.json { render json: { analysis: @analysis } }
       format.js
     end
-    logger.info "analyses_contoller.show leave"
+    logger.info "analyses_controller.show leave"
   end
 
   # GET /analyses/new
@@ -686,16 +692,18 @@ def plot_bar
   def analysis_data
     @analysis = Analysis.find(params[:id])
     datapoint_id = params[:datapoint_id] || nil
+    logger.debug "analyses_data params: #{params}"
     # other variables that can be specified
     options = {}
     options['visualize'] = params[:visualize] == 'true'
     options['export'] = params[:export] == 'true'
     options['pivot'] = params[:pivot] == 'true'
     options['perturbable'] = params[:perturbable] == 'true'
-
+    logger.debug "analyses_data options: #{options}"
     # get data
     @variables, @data = get_analysis_data(@analysis, datapoint_id, true, options)
-
+    logger.debug "analyses_data @variables: #{@variables}"
+    logger.debug "analyses_data @data: #{@data}"
     logger.info 'sending analysis data to view'
     respond_to do |format|
       format.json { render json: { variables: @variables, data: @data } }
@@ -885,8 +893,10 @@ def get_analysis_data(analysis, datapoint_id = nil, only_completed_normal = true
     options.each do |k, v|
       or_qry << { :"#{k}" => v } if v
     end
-    variables = Variable.where(analysis_id: analysis, :name.nin => ['', nil]).or(or_qry)
+    logger.debug "get_analysis_data or_qry: #{or_qry}"   
+    variables = Variable.where(analysis_id: analysis, :name.exists => true, :name.ne => '').any_of(or_qry)
                         .order_by([:pivot.desc, :perturbable.desc, :output.desc, :name.asc]).as_json(only: var_fields)
+    logger.debug "get_analysis_data variables: #{variables.to_a}"
 
     # Create a map from the _id to the variables machine name
     variable_name_map = Hash[variables.map { |v| [v['_id'], v['name'].tr('.', '|')] }]
@@ -999,7 +1009,10 @@ def get_analysis_data(analysis, datapoint_id = nil, only_completed_normal = true
   # Get plot variables
   # Used by plot_parallelcoordinates
   def get_plot_variables(analysis)
-    variables = Variable.where(analysis_id: analysis).or(perturbable: true).or(pivot: true).or(visualize: true).order_by(:name.asc)
+    any_of_qry = [{ perturbable: true }, { pivot: true }, { visualize: true }]
+    variables = Variable.where(analysis_id: analysis).any_of(any_of_qry).order_by(:name.asc)
+    logger.debug "GET_PLOT_VARIABLES: #{variables.to_a}"
+    variables
   end
 
   def write_and_send_csv(analysis, datapoint_ids = nil)

server/app/models/analysis.rb

@@ -79,6 +79,7 @@ class Analysis
 
   # Temp location for these vas
   field :samples, type: Integer
+  field :significant_digits, type: Integer, default: 3
 
   has_mongoid_attached_file :seed_zip,
                             url: '/assets/analyses/:id/:style/:basename.:extension',
@@ -328,7 +329,7 @@ def superset_of_input_variables
     # sort before sending back
     Hash[mappings.sort_by { |_, v| v }]
   end
-
+  
   # filter results on analysis show page (per status)
   def search(search, status, page_no = 1, view_all = 0)
     page_no = page_no.presence || 1

server/app/models/variable.rb

@@ -349,7 +349,7 @@ def self.get_variable_data_v2(analysis)
       :perturbable, :pivot, :output, :visualize, :export, :static_value, :minimum, :maximum,
       :objective_function, :objective_function_group, :objective_function_index, :objective_function_target
     ]
-    variables = Variable.where(analysis_id: analysis).or({ perturbable: true }, { pivot: true }, { output: true }, export: true).as_json(only: save_fields)
+    variables = Variable.where(analysis_id: analysis).any_of([{ perturbable: true }, { pivot: true }, { output: true }, { export: true }]).as_json(only: save_fields)
 
     # Add in some measure information into each of the variables, if it is a variable
     variables.each do |v|

server/app/views/analyses/_table.html.erb

@@ -66,33 +66,45 @@
   <div class="row-fluid">
     <div class="table-pad">
       <!--toggle obj function is there are more than 3-->
-
-      <% class_var = "" %>
-      <% if @objective_functions.count > 3 %>
-        <div class="button-container">
-          <button class="btn btn-mini" id='<%= "toggle-button-#{status || ''}"%>'>Toggle Obj Functions</button>
-          <% class_var = "obj-function-col-" + status %>
-        </div>
-      <% end %>
-
-      <!--toggle view_all on ALL page -->
-      <br/>
-
-      <% if status == 'all' and @view_all == 0 %>
-        <div class="button-container">
-          <%= link_to("View All", analysis_path(:id => @analysis, :view_all => 1, :status => status,
-                                                :all_page => all_page, :completed_page => completed_page,
-                                                :started_page => started_page, :queued_page => queued_page,
-                                                :na_page => na_page), :class => "btn btn-mini") %></button>
-        </div>
-      <% elsif status == 'all' and @view_all == 1 %>
-        <div class="button-container">
-          <%= link_to("Paginate", analysis_path(:id => @analysis.id, :status => status,
-                                                :view_all => 0), :class => "btn btn-mini") %>
+      <div>
+        <% class_var = "" %>
+        <% if @objective_functions.count > 1 %>
+
+          <div class="span4">
+            <div class="button-container">
+              <button class="btn btn-mini" id='<%= "toggle-button-#{status || ''}"%>'>Toggle Obj Functions</button>
+              <% class_var = "obj-function-col-" + status %>
+            </div>
+          </div>
+          <div class="span6">
+            <div class="sig-fig">
+              <%= form_tag analysis_path(@analysis), :method => 'get' do %>
+                <%= label_tag significant_digits, "Obj Func Significant Digits" %>
+                <%= number_field_tag "significant_digits", significant_digits %>
+                <%= submit_tag "Update" %>
+              <% end %>
+            </div>
+          </div>
+        <% end %>
+        <div class="span2">
+          <!--toggle view_all on ALL page -->
+          <% if status == 'all' and @view_all == 0 %>
+            <div class="button-container">
+              <%= link_to("View All", analysis_path(:id => @analysis, :view_all => 1, :status => status,
+                                                    :all_page => all_page, :completed_page => completed_page,
+                                                    :started_page => started_page, :queued_page => queued_page,
+                                                    :na_page => na_page), :class => "btn btn-mini") %></button>
+            </div>
+          <% elsif status == 'all' and @view_all == 1 %>
+            <div class="button-container">
+              <%= link_to("Paginate", analysis_path(:id => @analysis.id, :status => status,
+                                                    :view_all => 0), :class => "btn btn-mini") %>
+            </div>
+          <% end %>
         </div>
-      <% end %>
+      </div>
 
-      <table id="datapointtable_<%= status%>" class="tablesorter table table-striped">
+      <table id="datapointtable_<%= status%>" class="tablesorter table table-striped pad-top">
         <thead>
         <tr>
           <th>Name</th>
@@ -118,8 +130,8 @@
                 <!-- TODO: This is horrible. Can we use an ostruct? send the data from the contoller -->
                 <td class="<%= class_var %>">
                   <% if dp.results[ov['name'].split(".")[0]] && dp.results[ov['name'].split(".")[0]][ov['name'].split(".")[1]] %>
-                    <% if dp.results[ov['name'].split(".")[0]][ov['name'].split(".")[1]] =~ /\A[-+]?[0-9]*\.?[0-9]+\Z/ %>
-                      <%= dp.results[ov['name'].split(".")[0]][ov['name'].split(".")[1]].round(2) %>   
+                    <% if dp.results[ov['name'].split(".")[0]][ov['name'].split(".")[1]].class != String && !@analysis.significant_digits.nil? %>
+                      <%= dp.results[ov['name'].split(".")[0]][ov['name'].split(".")[1]].round(@analysis.significant_digits) %>   
                     <% else %>
                       <%= dp.results[ov['name'].split(".")[0]][ov['name'].split(".")[1]] %>
                     <% end %>

server/app/views/analyses/plot_parallelcoordinates.html.erb

@@ -157,9 +157,10 @@
 
     console.log("pareto names: ", pareto_names);
     console.log("include all data: ", include_all_data);
-
     d3.json("analysis_data.json?visualize=true", function (error, data) {
         //console.log(data['data']);
+      console.log("data['data']: ", data['data']);
+      console.log("data['variables']: ", data['variables']);
       var variables = data['variables']; 
       data = data['data'];
       if (Object.keys(pareto_points).length > 0 && !include_all_data) {

server/app/views/analyses/plot_xy_interactive.html.erb

@@ -166,7 +166,8 @@
       .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
 
   d3.json(encodeURI("analysis_data.json?visualize=true"), function (error, data) {
-
+    console.log("data['data']: ", data['data']);
+    console.log("data['variables']: ", data['variables']);
 
     // Compute the series names ("y1", "y2", etc.) from the loaded CSV.
     var seriesNames = new Array();

server/app/views/analyses/show.html.erb

@@ -162,35 +162,35 @@
         <% if @status == 'all' %>in active
         <% end %>">
         <div class="tab-container">
-          <%= render(:partial => "analyses/table", :locals => {:simulations => @all_sims, :current => @all_page, :status => 'all', :all_page => @all_page, :completed_page => @completed_page, :started_page => @started_page, :queued_page => @queued_page, :na_page => @na_page}) %>
+          <%= render(:partial => "analyses/table", :locals => {:simulations => @all_sims, :current => @all_page, :status => 'all', :all_page => @all_page, :completed_page => @completed_page, :started_page => @started_page, :queued_page => @queued_page, :na_page => @na_page, :significant_digits => @analysis.significant_digits}) %>
         </div>
       </div>
       <div id="sectionCompleted" class="tab-pane fade
         <% if @status == 'completed' %> in active
         <% end %>">
         <div class="tab-container">
-          <%= render(:partial => "analyses/table", :locals => {:simulations => @completed_sims, :current => @completed_page, :status => 'completed', :all_page => @all_page, :completed_page => @completed_page, :started_page => @started_page, :queued_page => @queued_page, :na_page => @na_page}) %>
+          <%= render(:partial => "analyses/table", :locals => {:simulations => @completed_sims, :current => @completed_page, :status => 'completed', :all_page => @all_page, :completed_page => @completed_page, :started_page => @started_page, :queued_page => @queued_page, :na_page => @na_page, :significant_digits => @analysis.significant_digits}) %>
         </div>
       </div>
       <div id="sectionStarted" class="tab-pane fade
         <% if @status == 'started' %>in active
         <% end %>">
         <div class="tab-container">
-          <%= render(:partial => "analyses/table", :locals => {:simulations => @started_sims, :current => @started_page, :status => 'started', :all_page => @all_page, :completed_page => @completed_page, :started_page => @started_page, :queued_page => @queued_page, :na_page => @na_page}) %>
+          <%= render(:partial => "analyses/table", :locals => {:simulations => @started_sims, :current => @started_page, :status => 'started', :all_page => @all_page, :completed_page => @completed_page, :started_page => @started_page, :queued_page => @queued_page, :na_page => @na_page, :significant_digits => @analysis.significant_digits}) %>
         </div>
       </div>
       <div id="sectionQueued" class="tab-pane fade
         <% if @status == 'queued' %>in active
         <% end %>">
         <div class="tab-container">
-          <%= render(:partial => "analyses/table", :locals => {:simulations => @queued_sims, :current => @queued_page, :status => 'queued', :all_page => @all_page, :completed_page => @completed_page, :started_page => @started_page, :queued_page => @queued_page, :na_page => @na_page}) %>
+          <%= render(:partial => "analyses/table", :locals => {:simulations => @queued_sims, :current => @queued_page, :status => 'queued', :all_page => @all_page, :completed_page => @completed_page, :started_page => @started_page, :queued_page => @queued_page, :na_page => @na_page, :significant_digits => @analysis.significant_digits}) %>
         </div>
       </div>
       <div id="sectionNA" class="tab-pane fade
         <% if @status == 'na' %>in active
         <% end %>">
         <div class="tab-container">
-          <%= render(:partial => "analyses/table", :locals => {:simulations => @na_sims, :current => @na_page, :status => 'na', :all_page => @all_page, :completed_page => @completed_page, :started_page => @started_page, :queued_page => @queued_page, :na_page => @na_page}) %>
+          <%= render(:partial => "analyses/table", :locals => {:simulations => @na_sims, :current => @na_page, :status => 'na', :all_page => @all_page, :completed_page => @completed_page, :started_page => @started_page, :queued_page => @queued_page, :na_page => @na_page, :significant_digits => @analysis.significant_digits}) %>
         </div>
       </div>
     </div>