openstudio-analysis 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ae67d42886b996287c5359e182083045cfe85b6
-  data.tar.gz: 89317f8592fb0d6d68be5d4d2b86fb8de0c33614
+  metadata.gz: 331135d293b11122531a3b462900a2f4f3728da2
+  data.tar.gz: 3d168b780e1b66e0818cf2919f7220b7b5015de9
 SHA512:
-  metadata.gz: d07df1298aeddd96b09b58a72ae55802d5badc04c194d50cac81df509dbf817b989b758a560306109d74a867ae8fd039543230f5b1edbac45870e77ad23525c7
-  data.tar.gz: ad4f1c8a02213360581455198bd1ffa8e19750967359ba223048b35f2a3de5296bd89e8a02de71494c2496cce8e95cfa1c277fda38caea5516e761b252c9ce75
+  metadata.gz: 528fcf1894bc7d1615a46ffa9c7e97eb03f7302558b58b962a31a95b16cb752382c1dd4e8ff86453bfec91790cbf12de58ab7a9e51db50a9173f9c5e69f19f64
+  data.tar.gz: 50b95802b1e19035ba1f1e1ff874851f4ae1b34496a53b1e7761c0c6edc11e91d539c8df2c491605ce1e9b25e7ea82cb5ca935846674a9558958730b78053498

data/lib/openstudio/analysis/server_api.rb

@@ -8,6 +8,7 @@ module OpenStudio
       def initialize(options = {})
         defaults = {:hostname => "http://localhost:8080"}
         options = defaults.merge(options)
+        @logger = Logger.new("faraday.log")
         
         @hostname = options[:hostname]
 
@@ -16,7 +17,8 @@ module OpenStudio
         # create connection with basic capabilities
         @conn = Faraday.new(:url => @hostname) do |faraday|
           faraday.request :url_encoded # form-encode POST params
-          faraday.response :logger # log requests to STDOUT
+          faraday.use Faraday::Response::Logger, @logger
+          #faraday.response @logger # log requests to STDOUT
           faraday.adapter Faraday.default_adapter # make requests with Net::HTTP
         end
 
@@ -24,7 +26,8 @@ module OpenStudio
         @conn_multipart = Faraday.new(:url => @hostname) do |faraday|
           faraday.request :multipart
           faraday.request :url_encoded # form-encode POST params
-          faraday.response :logger # log requests to STDOUT
+          faraday.use Faraday::Response::Logger, @logger
+          #faraday.response :logger # log requests to STDOUT
           faraday.adapter Faraday.default_adapter # make requests with Net::HTTP
         end
       end

data/lib/openstudio/analysis/translator/excel.rb

@@ -33,7 +33,7 @@ module OpenStudio
           end
 
           # Initialize some other instance variables
-          @version = nil
+          @version = '0.0.1'
           @name = nil
           @machine_name = nil
           @settings = {}
@@ -63,6 +63,9 @@ module OpenStudio
         end
 
         def validate_analysis
+          version_test = Semantic::Version.new @version
+          raise "Spreadsheet version #{@version} is no longer supported.  Please upgrade your spreadsheet to at least 0.1.9" if version_test < '0.1.9'
+
           # Setup the paths and do some error checking
           raise "Measures directory '#{@measure_path}' does not exist" unless Dir.exists?(@measure_path)
 
@@ -135,11 +138,17 @@ module OpenStudio
           true
         end
 
-        def save_analysis
+        def create_analysis_hash
           # save the format in the OpenStudio analysis json format template without
           # the correct weather files or models
           @template_json = translate_to_analysis_json_template()
-
+          
+          @template_json
+        end
+        
+        def save_analysis
+          @template_json = create_analysis_hash
+          
           #validate_template_json
 
           # iterate over each model and save the zip and json
@@ -164,6 +173,11 @@ module OpenStudio
           # Templated analysis json file (this is what is returned)
           puts "Analysis name is #{@name}"
           openstudio_analysis_json = JSON.parse(analysis_template.result(get_binding))
+          
+          openstudio_analysis_json['analysis']['problem'].merge!(@problem)
+          openstudio_analysis_json['analysis']['problem']['algorithm'].merge!(@algorithm)
+          
+          
 
           @measure_index = -1
           @variables['data'].each do |measure|
@@ -254,21 +268,21 @@ module OpenStudio
 
           Zip::File.open(zipfile_name, Zip::File::CREATE) do |zipfile|
             @weather_files.each do |filename|
-              puts "  Adding #{filename}"
+              #puts "  Adding #{filename}"
               zipfile.add("./weather/#{File.basename(filename)}", filename)
             end
 
             Dir.glob("#{@measure_path}/**/*.rb").each do |measure|
               next if measure.include?("spec") # don't include the spec folders nor files
               measure_name = measure.split(File::SEPARATOR).last(2).first
-              puts "  Adding ./measures/#{measure_name}/#{File.basename(measure)}"
+              #puts "  Adding ./measures/#{measure_name}/#{File.basename(measure)}"
               zipfile.add("./measures/#{measure_name}/#{File.basename(measure)}", measure)
             end
 
-            puts "Adding #{model[:path]}"
+            #puts "Adding #{model[:path]}"
             zipfile.add("./seed/#{File.basename(model[:path])}", model[:path])
 
-            puts "Adding in other files #{@other_files.inspect}"
+            #puts "Adding in other files #{@other_files.inspect}"
             @other_files.each do |others|
               Dir[File.join(others[:path], '**', '**')].each do |file|
                 zipfile.add(file.sub(others[:path], "./lib/#{others[:lib_zip_name]}/"), file)
@@ -385,9 +399,18 @@ module OpenStudio
               @export_path = File.expand_path(File.join(@root_path, row[1])) if row[0] == "Export Directory"
               @measure_path = File.expand_path(File.join(@root_path, row[1])) if row[0] == "Measure Directory"
             elsif b_problem_setup
-              @problem["#{row[0].snake_case}"] = row[1] if row[0]
+              if row[0] 
+                v = row[1]
+                v.to_i if v % 1 == 0
+                @problem["#{row[0].snake_case}"] = v
+              end
+               
             elsif b_algorithm_setup
-              @algorithm["#{row[0].snake_case}"] = row[1] if row[0]
+              if row[0]
+                v = row[1]
+                v = v.to_i if v % 1 == 0 
+                @algorithm["#{row[0].snake_case}"] = v
+              end
             elsif b_weather_files
               if row[0] == "Weather File"
                 @weather_files += Dir.glob(File.expand_path(File.join(@root_path, row[1])))

data/lib/openstudio/analysis/version.rb

@@ -1,6 +1,6 @@
 module OpenStudio
   module Analysis
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
     OPENSTUDIO_VERSION = "1.1.4"
   end
 end

data/lib/openstudio/templates/analysis.json.erb

@@ -2,17 +2,9 @@
     "analysis": {
         "display_name": "<%= @name %>",
         "name": "<%= @name.downcase.gsub(" ", "_") %>",
-        "algorithm": {
-            "sample_method": "lhs",
-            "number_of_samples": <%= @problem['number_of_samples'].to_i %>
-        },
         "parameter_space": [],
         "problem": {
-            "number_of_samples_KEEP_HERE_UNTIL_ALGO_IS_IMPLEMENTED": <%= @problem['number_of_samples'].to_i %>,
-            "number_of_samples": <%= @problem['number_of_samples'].to_i %>,
             "algorithm": {
-                "number_of_samples": <%= @problem['number_of_samples'].to_i %>,
-                "sample_method": <%= @problem['sensitivity_method'].to_i %>
             },
             "name": "Problem",
             "workflow": []

data/lib/openstudio-analysis.rb

@@ -4,6 +4,8 @@ require 'uuid'
 require 'roo'
 require 'erb'
 require 'zip'
+require 'semantic'
+require 'logger'
 
 # core
 require 'openstudio/analysis/server_api'