openstudio-analysis 1.0.0.pre.rc3 → 1.0.0.pre.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08f1c56ecac14dce6b5f6da391730640a46dbecd
-  data.tar.gz: 8ed2cad5fe61d8314a91f75ddda8ca2ff4bbeb04
+  metadata.gz: 54391b81c2f65e4be2f21d880318705e49482bc0
+  data.tar.gz: 0e107eced77ba5b34747b26b73b125d65619d8c1
 SHA512:
-  metadata.gz: 069cedb27a9a0b9c8d7f13ac6ea5b780e6e3757fd07e9536bef4116612d650d023736f533b7d207a5754e479f059ed10ca570513a70ccda5859a6c3365a9f6c4
-  data.tar.gz: 168d9a504aad35de67c6c3fb5ce437f96b3d8cfe74382e6dde3af3348f2791b1ef0cb88dd186b5eab17323074aa9c57ab701696e837508df0a022e39cced5c94
+  metadata.gz: 85902d52a7300052efc0914aaa6d40355a5eadb8bf4adbe479dce69505cfddf54d41759104f348aef3dc8f513f142883ea67061106f1d88350f4d3179de4b030
+  data.tar.gz: b25fc97d234143affac537fb34288c7467c2c1afaf465c94bea48c69680d0c3efb2f2ecefe70b75cab99a1914a64f635fa46af8b762d24d41670a0a92eec2470

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 OpenStudio Analysis Gem Change Log
 ==================================
 
+Version 1.0.0.pre.rc4
+---------------------
+* Change seed_model to seed_file in OSWs generated from the translator
+* Add more unit tests
+
 Version 1.0.0.pre.rc3
 ---------------------
 * Catch null arguments when translating from OSA/OSD to OSW

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

@@ -2,9 +2,6 @@ module OpenStudio
   module Analysis
     module Translator
 
-      require 'json'
-      require 'securerandom'
-
       class Workflow
         attr_reader :osa_filename
         attr_reader :root_path
@@ -25,7 +22,7 @@ module OpenStudio
 
           # try to read the osa json file
           if File.exist?(@osa_filename)
-            @osa = ::JSON.parse(File.read(@osa_filename), {symbolize_names: true})[:analysis]
+            @osa = ::JSON.parse(File.read(@osa_filename), symbolize_names: true)[:analysis]
           else
             fail "File #{@osa_filename} does not exist"
           end
@@ -46,7 +43,7 @@ module OpenStudio
             step_hash[:measure_dir_name] = File.basename(step[:measure_definition_directory])
             step_hash[:arguments] = {}
             # Measures can have no arguments -- make sure to catch it
-            if @osa[:problem][:workflow][i][:arguments] 
+            if @osa[:problem][:workflow][i][:arguments]
               @osa[:problem][:workflow][i][:arguments].each do |arg|
                 step_hash[:arguments][arg[:name].to_sym] = arg[:value]
               end
@@ -55,12 +52,13 @@ module OpenStudio
           end
         end
 
+        # Convert a file in the form of an OSD into an OSW
         def process_datapoint(osd_filename)
           # Try to read the osd json file
           osd = nil
           if File.exist?(osd_filename)
             # warn('data_point selector in ods will be changed to datapoint in version 1.0') # NL this isn't true anymore.
-            osd = ::JSON.parse(File.read(osd_filename), {symbolize_names: true})[:data_point]
+            osd = ::JSON.parse(File.read(osd_filename), symbolize_names: true)[:data_point]
           else
             fail "File #{osd_filename} does not exist"
           end
@@ -82,7 +80,7 @@ module OpenStudio
           # Save the OSW hash
           osw = {}
           created_at = ::Time.now
-          osw[:seed_model] = @seed_file
+          osw[:seed_file] = @seed_file
           osw[:weather_file] = @weather_file
           osw[:file_format_version] = @osw_version
           osw[:osa_id] = @osa_id
@@ -97,13 +95,17 @@ module OpenStudio
 
         # Runs an array of OSD files
         def process_datapoints(osd_filename_array)
+          r = []
           osd_filename_array.each do |osd_file|
             begin
-              yield process_datapoint(osd_file)
+              r << process_datapoint(osd_file)
             rescue => e
-              puts "Warning: Failed to processes datapoint #{osd_file} with error #{e.message} in #{e.backtrace.join('\n')}"
+              r << nil
+              puts "Warning: Failed to process datapoint #{osd_file} with error #{e.message} in #{e.backtrace.join('\n')}"
             end
           end
+
+          return r
         end
       end
     end

data/lib/openstudio/analysis/version.rb

@@ -1,5 +1,5 @@
 module OpenStudio
   module Analysis
-    VERSION = '1.0.0-rc3'
+    VERSION = '1.0.0-rc4'
   end
 end

data/spec/openstudio/osw_spec.rb

@@ -49,6 +49,8 @@ describe OpenStudio::Analysis::Translator::Workflow do
     let(:osa_path) { 'analysis.osa' }
 
     before(:each) do
+      FileUtils.mkdir_p 'spec/files/export/workflow' unless Dir.exist? 'spec/files/export/workflow'
+
       Dir.chdir 'spec/files/workflow'
       @translator = OpenStudio::Analysis::Translator::Workflow.new(osa_path)
     end
@@ -59,7 +61,16 @@ describe OpenStudio::Analysis::Translator::Workflow do
 
     it 'should write a single osd' do
       osd_path = 'datapoint_0.osd'
-      expect{ @translator.process_datapoint(osd_path) }.not_to raise_error
+      result = @translator.process_datapoint(osd_path)
+      expect(result).to be_a(Hash)
+
+      # Save the file to the export directory
+      File.open('../../../spec/files/export/workflow/0.osw', 'w') { |f| f << JSON.pretty_generate(result)}
+
+      expect(result.key?(:seed_model)).to eq false
+      expect(result[:seed_file]).to eq 'large_office_air_cooled_chiller.osm'
+      expect(result[:weather_file]).to eq 'USA_CO_Denver.Intl.AP.725650_TMY3.epw'
+      expect(result[:file_format_version]).to eq '0.0.1'
     end
 
     it 'should not write a osd with a different osa id' do
@@ -69,550 +80,15 @@ describe OpenStudio::Analysis::Translator::Workflow do
 
     it 'should write several osds' do
       osd_paths = %w(datapoint_0.osd datapoint_1.osd datapoint_2.osd)
-      expect{ @translator.process_datapoints(osd_paths).each {|_|} }.not_to raise_error
+      r = @translator.process_datapoints(osd_paths)
+      expect(r.size).to eq 3
     end
 
     it 'should not fail when one osd is bad' do
-      osd_paths = %w(datapoint_0.osd datapoint_1.osd datapoint_2.osd)
-      expect{ @translator.process_datapoints(osd_paths).each {|_|} }.not_to raise_error
-    end
-  end
-=begin
-  context 'small list of incomplete variables' do
-    before(:all) do
-      @excel = OpenStudio::Analysis::Translator::Excel.new('spec/files/0_1_09_small_list_incomplete.xlsx')
-    end
-
-    it 'should fail to process' do
-      expect { @excel.process }.to raise_error('Variable adjust_thermostat_setpoints_by_degrees:cooling_adjustment must have a mean')
-    end
-  end
-
-  context 'small list with with repeated variable names' do
-    before(:all) do
-      @excel = OpenStudio::Analysis::Translator::Excel.new('spec/files/0_1_09_small_list_repeat_vars.xlsx')
-    end
-
-    it 'should fail to process' do
-      expect { @excel.process }.to raise_error("duplicate variable names found in list [\"Insulation R-value (ft^2*h*R/Btu).\"]")
-    end
-  end
-
-  context 'small list of variables should not validate' do
-    before(:all) do
-      @excel = OpenStudio::Analysis::Translator::Excel.new('spec/files/0_1_09_small_list_validation_errors.xlsx')
-    end
-
-    it 'should fail to process' do
-      error_message = 'Variable min is greater than variable max for adjust_thermostat_setpoints_by_degrees:heating_adjustment'
-      expect { @excel.process }.to raise_error(error_message)
-    end
-  end
-
-  context 'small list of variables' do
-    before(:all) do
-      @excel = OpenStudio::Analysis::Translator::Excel.new('spec/files/0_1_09_small_list.xlsx')
-      @excel.process
-    end
-    it 'should have a model' do
-      expect(@excel.models.first).not_to be_nil
-      expect(@excel.models.first[:name]).to eq('small_seed')
-    end
-
-    it 'should have a weather file' do
-      expect(@excel.weather_files.first).not_to be_nil
-      expect(@excel.weather_files.first.include?('partial_weather')).to eq(true)
-    end
-
-    it 'should have notes and source' do
-      @excel.variables['data'].each do |measure|
-        measure['variables'].each do |var|
-          if var['machine_name'] == 'lighting_power_reduction'
-            expect(var['distribution']['source']).to eq('some data source')
-          elsif var['machine_name'] == 'demo_cost_initial_const'
-            expect(var['notes']).to eq('some note')
-          end
-        end
-      end
-    end
-
-    it 'should write a json' do
-      @excel.save_analysis
-      expect(File).to exist('spec/files/export/analysis/example_analysis.json')
-      expect(File).to exist('spec/files/export/analysis/example_analysis.zip')
-
-      expect(JSON.parse(File.read('spec/files/export/analysis/example_analysis.json'))).not_to be_nil
-    end
-  end
-
-  context 'setup version 0.1.9' do
-    before(:all) do
-      @excel = OpenStudio::Analysis::Translator::Excel.new('spec/files/0_1_09_setup_version_2.xlsx')
-      @excel.process
-    end
-
-    it 'should have a version and analysis name in machine format' do
-      expect(@excel.version).to eq('0.1.9')
-      expect(@excel.analysis_name).to eq('example_analysis')
-    end
-    it 'should have the new settings' do
-      expect(@excel.settings['server_instance_type']).to eq('m2.xlarge')
-    end
-
-    it 'should have algorithm setup' do
-      h = @excel.analysis
-
-      expect(h.algorithm['number_of_samples']).to eq(100)
-      expect(h.algorithm['number_of_generations']).to eq(20)
-      expect(h.algorithm['sample_method']).to eq('all_variables')
-      expect(h.algorithm['number_of_generations']).to be_a Integer
-      expect(h.algorithm['tolerance']).to eq(0.115)
-      expect(h.algorithm['tolerance']).to be_a Float
-    end
-
-    it 'should create a valid hash' do
-      h = @excel.analysis
-
-      expect(h.analysis_type).to eq('lhs')
-      expect(h.algorithm).to be_a OpenStudio::Analysis::AlgorithmAttributes
-      expect(h.algorithm['number_of_samples']).to eq(100)
-      expect(h.algorithm['sample_method']).to eq('all_variables')
-    end
-  end
-
-  context 'proxy setup' do
-    before(:all) do
-      @excel = OpenStudio::Analysis::Translator::Excel.new('spec/files/0_1_10_proxy.xlsx')
-      @excel.process
-    end
-
-    it 'should have a proxy setting' do
-      expect(@excel.settings['proxy_host']).to eq('192.168.0.1')
-      expect(@excel.settings['proxy_port']).to eq(8080)
-      expect(@excel.settings['proxy_username']).to be_nil
-    end
-  end
-
-  context 'proxy setup with user' do
-    before(:all) do
-      @excel = OpenStudio::Analysis::Translator::Excel.new('spec/files/0_1_10_proxy_user.xlsx')
-      @excel.process
-    end
-
-    it 'should have a user' do
-      expect(@excel.settings['proxy_host']).to eq('192.168.0.1')
-      expect(@excel.settings['proxy_port']).to eq(8080)
-      expect(@excel.settings['proxy_username']).to eq('a_user')
-    end
-  end
-
-  context 'discrete variables' do
-    before(:all) do
-      @excel = OpenStudio::Analysis::Translator::Excel.new('spec/files/0_1_11_discrete_variables.xlsx')
-      @excel.process
-    end
-
-    it 'should have parsed the spreadsheet' do
-      @excel.variables['data'].each do |measure|
-        measure['variables'].each do |var|
-          # TODO: Add some tests!
-          if var['name'] == 'alter_design_days'
-            expect(var['type']).to eq 'bool'
-            expect(var['distribution']['discrete_values']).to match_array [true, false]
-            expect(var['distribution']['discrete_weights']).to match_array [0.8, 0.2]
-          end
-        end
-      end
-    end
-
-    it 'should save the file' do
-      @excel.save_analysis
-      expect(File.exist?('spec/files/export/analysis/example_analysis.json')).to eq true
-      expect(File.exist?('spec/files/export/analysis/example_analysis.zip')).to eq true
-    end
-  end
-
-  context 'discrete with dynamic columns' do
-    before(:all) do
-      @excel = OpenStudio::Analysis::Translator::Excel.new('spec/files/0_1_12_discrete_dynamic_columns.xlsx')
-      @excel.process
-    end
-
-    it 'should have parsed the spreadsheet' do
-      @excel.variables['data'].each do |measure|
-        measure['variables'].each do |_var|
-          # TODO: test something?
-        end
-      end
-    end
-
-    it 'should save the file' do
-      @excel.save_analysis
-      expect(File.exist?('spec/files/export/analysis/test_model.json')).to eq true
-      expect(File.exist?('spec/files/export/analysis/test_model.zip')).to eq true
-    end
-  end
-
-  context 'setup output variables' do
-    before(:all) do
-      @excel = OpenStudio::Analysis::Translator::Excel.new('spec/files/0_1_09_outputvars.xlsx')
-      @excel.process
-    end
-
-    it 'should have a model' do
-      expect(@excel.models.first).not_to be_nil
-      expect(@excel.models.first[:name]).to eq('0_1_09_outputvars')
-    end
-
-    it 'should have a weather file' do
-      expect(@excel.weather_files.first).not_to be_nil
-      expect(@excel.weather_files.first.include?('partial_weather')).to eq(true)
-    end
-
-    it 'should have notes and source' do
-      @excel.variables['data'].each do |measure|
-        measure['variables'].each do |var|
-          if var['machine_name'] == 'lighting_power_reduction'
-            expect(var['distribution']['source']).to eq('some data source')
-          elsif var['machine_name'] == 'demo_cost_initial_const'
-            expect(var['notes']).to eq('some note')
-          end
-        end
-      end
-    end
-
-    it 'should have algorithm setup' do
-      expect(@excel.algorithm['number_of_samples']).to eq(100)
-      expect(@excel.algorithm['number_of_generations']).to eq(20)
-      expect(@excel.algorithm['sample_method']).to eq('all_variables')
-      expect(@excel.algorithm['number_of_generations']).to be_a Integer
-      # expect(@excel.algorithm["tolerance"]).to eq(0.115)
-      # expect(@excel.algorithm["tolerance"]).to be_a Float
-    end
-
-    it 'should create a valid hash' do
-      h = @excel.analysis
-
-      expect(h.analysis_type).to eq('nsga')
-      expect(h.algorithm).to be_a OpenStudio::Analysis::AlgorithmAttributes
-      expect(h.algorithm['number_of_samples']).to eq(100)
-      expect(h.algorithm['sample_method']).to eq('all_variables')
-    end
-
-    it 'should write a json' do
-      @excel.save_analysis
-      expect(File).to exist('spec/files/export/analysis/0_1_09_outputvars.json')
-      expect(File).to exist('spec/files/export/analysis/0_1_09_outputvars.zip')
-      expect(JSON.parse(File.read('spec/files/export/analysis/0_1_09_outputvars.json'))).not_to be_nil
-    end
-  end
-
-  context 'version 0.1.10' do
-    before(:all) do
-      @excel = OpenStudio::Analysis::Translator::Excel.new('spec/files/0_1_10_template_input.xlsx')
-    end
-
-    it 'should process' do
-      expect(@excel.process).to eq(true)
-    end
-
-    it 'should have new setting variables' do
-      expect(@excel.settings['user_id']).to eq('new_user')
-      expect(@excel.settings['openstudio_server_version']).to eq('1.3.2')
-      expect(@excel.cluster_name).to eq('analysis_cluster')
-      expect(@excel.run_setup['analysis_name']).to eq('LHS Example Project')
-    end
-  end
-
-  context 'version 0.2.0' do
-    before(:all) do
-      @excel = OpenStudio::Analysis::Translator::Excel.new('spec/files/0_2_0_template.xlsx')
-    end
-
-    it 'should process' do
-      expect(@excel.process).to eq(true)
-    end
-
-    it 'should have new setting variables' do
-      expect(@excel.settings['user_id']).to eq('new_user')
-      expect(@excel.settings['openstudio_server_version']).to eq('1.3.2')
-      expect(@excel.cluster_name).to eq('analysis_cluster_name')
-      expect(@excel.run_setup['analysis_name']).to eq('Name goes here')
-    end
-
-    it 'should have the new measure directory column' do
-      expect(@excel.variables['data'][1]['measure_file_name_directory']).to eq('ReduceLightingLoadsByPercentage')
-    end
-
-    it 'should write a json' do
-      @excel.save_analysis
-    end
-  end
-
-  context 'version 0.2.0 simple' do
-    before(:all) do
-      @excel = OpenStudio::Analysis::Translator::Excel.new('spec/files/0_2_0_template_simpletest.xlsx')
-    end
-
-    it 'should process' do
-      expect(@excel.process).to eq(true)
-    end
-
-    it 'should have new setting variables' do
-      expect(@excel.settings['user_id']).to eq('new_user')
-      expect(@excel.settings['openstudio_server_version']).to eq('1.3.2')
-    end
-
-    it 'should have the new measure directory column' do
-      expect(@excel.variables['data'][0]['measure_file_name_directory']).to eq('ExampleMeasure')
-      expect(@excel.variables['data'][0]['display_name']).to eq('Baseline')
-    end
-
-    it 'should write a json' do
-      @excel.save_analysis
-      expect(File.exist?('spec/files/export/analysis/simple_test.json')).to eq true
-      expect(File.exist?('spec/files/export/analysis/simple_test.zip')).to eq true
-    end
-  end
-
-  context 'version 0.3.0 objective functions' do
-    before(:all) do
-      @excel = OpenStudio::Analysis::Translator::Excel.new('spec/files/0_3_0_outputs.xlsx')
-      expect(@excel.process).to eq(true)
-    end
-
-    it 'should have new setting variables' do
-      expect(@excel.settings['user_id']).to eq('new_user')
-      expect(@excel.settings['openstudio_server_version']).to eq('1.6.1')
-    end
-
-    it 'should have typed outputs' do
-      h = @excel.analysis
-
-      expect(h.outputs).to be_an Array
-      h.outputs.each do |o|
-        if o['name'] == 'standard_report_legacy.total_energy'
-          expect(o['variable_type']).to eq 'double'
-          expect(o['objective_function']).to eq true
-          expect(o['objective_function_index']).to eq 0
-          expect(o['objective_function_target']).to eq nil
-          expect(o['scaling_factor']).to eq nil
-          expect(o['objective_function_group']).to eq 1
-        end
-        if o['name'] == 'standard_report_legacy.total_source_energy'
-          expect(o['variable_type']).to eq 'double'
-          expect(o['objective_function']).to eq true
-          expect(o['objective_function_index']).to eq 1
-          expect(o['objective_function_target']).to eq 25.1
-          expect(o['scaling_factor']).to eq 25.2
-          expect(o['objective_function_group']).to eq 7
-        end
-      end
-    end
-
-    it 'should write a json' do
-      @excel.save_analysis
-      expect(File.exist?('spec/files/export/analysis/0_3_0_outputs.json')).to eq true
-      expect(File.exist?('spec/files/export/analysis/0_3_0_outputs.zip')).to eq true
-
-      # check the JSON
-      h = JSON.parse(File.read('spec/files/export/analysis/0_3_0_outputs.json'))
-      expect(h['analysis']['weather_file']).to be_a Hash
-      expect(h['analysis']['weather_file']['path']).to match /partial_weather.*epw/
-    end
-  end
-
-  context 'version 0.3.0 measure existence checks' do
-    before(:all) do
-      @excel = OpenStudio::Analysis::Translator::Excel.new('spec/files/0_3_0_measure_existence.xlsx')
-    end
-
-    it 'should process' do
-      expect(@excel.process).to eq(true)
-
-      model_name = @excel.models.first[:name]
-      expect(model_name).to eq '0_3_0_outputs'
-    end
-
-    it 'should error out with missing measure information' do
-      expect { @excel.save_analysis }.to raise_error /Measure in directory.*not contain a measure.rb.*$/
-    end
-  end
-
-  context 'version 0.3.0 dynamic uuid assignments' do
-    before(:all) do
-      @excel = OpenStudio::Analysis::Translator::Excel.new('spec/files/0_3_0_dynamic_uuids.xlsx')
-      expect(@excel.process).to eq(true)
-    end
-
-    it 'should process' do
-      model_uuid = @excel.models.first[:name]
-      expect(model_uuid).to match /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/
-    end
-
-    it 'should error out with missing measure information' do
-      @excel.save_analysis
-      model_uuid = @excel.models.first[:name]
-      expect(File.exist?('spec/files/export/analysis/0_3_0_dynamic_uuids.json')).to eq true
-      expect(File.exist?('spec/files/export/analysis/0_3_0_dynamic_uuids.zip')).to eq true
-    end
-  end
-
-  context 'version 0.3.3 and short display names' do
-    before :all do
-      @excel = OpenStudio::Analysis::Translator::Excel.new('spec/files/0_3_3_short_names.xlsx')
-      expect(@excel.process).to eq(true)
-    end
-
-    it 'should process' do
-      model_uuid = @excel.models.first[:name]
-      expect(model_uuid).to match /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/
-    end
-
-    it 'should process and save short display names' do
-      @excel = OpenStudio::Analysis::Translator::Excel.new('spec/files/0_3_3_short_names.xlsx')
-      expect(@excel.process).to eq(true)
-      @excel.save_analysis
-      model_uuid = @excel.models.first[:name]
-      expect(File.exist?('spec/files/export/analysis/0_3_3_short_names.json')).to eq true
-      expect(File.exist?('spec/files/export/analysis/0_3_3_short_names.zip')).to eq true
-
-      @excel.outputs['output_variables'].each do |o|
-        expect(o['display_name_short']).to eq 'Site EUI' if o['name'] == 'standard_report_legacy.total_energy'
-        expect(o['display_name_short']).to eq 'Natural Gas Heating Intensity' if o['name'] == 'standard_report_legacy.heating_natural_gas'
-      end
-
-      # Check the JSON
-      j = JSON.parse(File.read('spec/files/export/analysis/0_3_3_short_names.json'))
-
-      expect(j['analysis']['output_variables'].first['display_name']).to eq 'Total Site Energy Intensity'
-      expect(j['analysis']['output_variables'].first['display_name_short']).to eq 'Site EUI'
-      expect(j['analysis']['problem']['workflow'][0]['variables'][0]['argument']['display_name']).to eq 'Orientation'
-      expect(j['analysis']['problem']['workflow'][0]['variables'][0]['argument']['display_name_short']).to eq 'Shorter Display Name'
-      expect(j['analysis']['problem']['workflow'][1]['arguments'][0]['display_name']).to eq 'unknown'
-      expect(j['analysis']['problem']['workflow'][1]['arguments'][0]['display_name_short']).to eq 'un'
-    end
-  end
-
-  context 'version 0.3.5 and measure paths' do
-    before :all do
-      @excel = OpenStudio::Analysis::Translator::Excel.new('spec/files/0_3_5_multiple_measure_paths.xlsx')
-      expect(@excel.process).to eq(true)
-    end
-
-    it 'should save the analysis' do
-      @excel.save_analysis
-      model_uuid = @excel.models.first[:name]
-
-      expect(File.exist?('spec/files/export/analysis/0_3_5_multiple_measure_paths.json')).to eq true
-      expect(File.exist?('spec/files/export/analysis/0_3_5_multiple_measure_paths.zip')).to eq true
-
-      expect(@excel.settings['openstudio_server_version']).to eq('1.8.0')
-      expect(@excel.settings['spreadsheet_version']).to eq '0.3.5'
-      expect(@excel.settings['server_instance_type']).to eq 'm3.xlarge'
-      expect(@excel.settings['worker_instance_type']).to eq 'c3.2xlarge'
-
-      expect(@excel.aws_tags).to eq(['org=5500', 'nothing=else matters'])
-    end
-  end
-
-  context 'version 0.3.7 and worker init-final scripts' do
-    before :all do
-      @excel = OpenStudio::Analysis::Translator::Excel.new('spec/files/0_3_7_worker_init_final.xlsx')
-      expect(@excel.process).to eq(true)
-    end
-
-    it 'should save the analysis' do
-      @excel.save_analysis
-      model_uuid = @excel.models.first[:name]
-
-      expect(File.exist?('spec/files/export/analysis/0_3_7_worker_init_final.json')).to eq true
-      expect(File.exist?('spec/files/export/analysis/0_3_7_worker_init_final.zip')).to eq true
-
-      expect(@excel.worker_inits.size).to eq 2
-      expect(@excel.worker_inits[0][:name]).to eq 'initialize me'
-      expect(@excel.worker_inits[0][:args]).to eq "[\"first_arg\",2,{a_hash: \"input\"}]"
-
-      # test the eval'ing of the args
-      a = eval(@excel.analysis.worker_inits.first[:metadata][:args])
-      expect(a[0]).to eq 'first_arg'
-      expect(a[1]).to eq 2
-      expect(a[2]).to be_a Hash
-      expect(a[2][:a_hash]).to eq 'input'
-
-      expect(File.basename(@excel.analysis.worker_inits.first[:file])).to eq 'first_file.rb'
-      expect(File.basename(@excel.analysis.worker_inits.last[:file])).to eq 'second_file.rb'
-
-      expect(@excel.analysis.worker_finalizes.size).to eq 1
-      expect(File.basename(@excel.analysis.worker_finalizes.first[:file])).to eq 'first_file.rb'
-    end
-  end
-
-  context 'version 0.3.7 and worker init-final scripts' do
-    before :all do
-      @excel = OpenStudio::Analysis::Translator::Excel.new('spec/files/0_4_0_lhs_discrete_continuous.xlsx')
-    end
-
-    it 'should fail to process' do
-      @excel.process
-      # expect { @excel.process }.to raise_error("Measure Display Names are not unique for 'Rotate Building Relative to Current Orientation', 'Nothing Important'")
-
-      @excel.save_analysis
-    end
-  end
-
-  context 'version 0.4.0 multiple seed models' do
-    before :all do
-      @excel = OpenStudio::Analysis::Translator::Excel.new('spec/files/0_4_0_multiple_seeds.xlsx')
-      expect(@excel.process).to eq(true)
-    end
-
-    it 'should save the analysis' do
-      expect { @excel.analysis }.to raise_error /There are more than one seed models defined in the excel file. Call .analyses. to return the array/
-      model_uuid = "#{@excel.name.snake_case}_#{@excel.models.first[:name]}"
-
-      @excel.save_analysis # this will save all the analyses
-
-      @excel.models.each do |f|
-        model_uuid = "#{@excel.name.snake_case}_#{f[:name]}"
-        puts model_uuid
-        expect(File.exist?("spec/files/export/analysis/#{model_uuid}.json")).to eq true
-        expect(File.exist?("spec/files/export/analysis/#{model_uuid}.zip")).to eq true
-      end
-
-      expect(@excel.settings['openstudio_server_version']).to eq('1.11.0-rc2')
-      expect(@excel.settings['spreadsheet_version']).to eq '0.3.7'
-      expect(@excel.settings['server_instance_type']).to eq 'm3.xlarge'
-      expect(@excel.settings['worker_instance_type']).to eq 'c3.4xlarge'
-      expect(@excel.aws_tags).to eq(['org=5500'])
-    end
-  end
-
-  context 'version 0.4.0 pivot test' do
-    before :all do
-      @excel = OpenStudio::Analysis::Translator::Excel.new('spec/files/0_4_0_pivot_test.xlsx')
-      expect(@excel.process).to eq(true)
-    end
-
-    it 'should save the analysis' do
-      a = @excel.analysis
-
-      @excel.save_analysis # this will save all the analyses
-
-      j = JSON.parse(File.read('spec/files/export/analysis/pivot_test.json'))
-
-      expect(j['analysis']['problem']['workflow'][0]['name']).to eq 'reduce_lighting_loads_by_percentage'
-      expect(j['analysis']['problem']['workflow'][0]['variables'][0]['variable_type']).to eq 'pivot'
-      expect(j['analysis']['problem']['workflow'][0]['variables'][0]['pivot']).to eq true
-      expect(j['analysis']['problem']['workflow'][1]['variables'][0]['variable']).to eq true
-      expect(j['analysis']['problem']['workflow'][1]['variables'][0]['pivot']).to eq nil
-
-      expect(@excel.settings['openstudio_server_version']).to eq('1.11.0-rc2')
-      expect(@excel.settings['spreadsheet_version']).to eq '0.3.7'
-      expect(@excel.settings['server_instance_type']).to eq 'm3.xlarge'
-      expect(@excel.settings['worker_instance_type']).to eq 'c3.4xlarge'
-      expect(@excel.aws_tags).to eq(['org=5500'])
+      osd_paths = %w(datapoint_0.osd datapoint_1.osd datapoint_wrong_osa_id.osd)
+      r = @translator.process_datapoints(osd_paths)
+      expect(r[0]).to be_a Hash
+      expect(r[2]).to eq nil
     end
   end
-=end
 end

data/spec/openstudio/support_files_spec.rb

@@ -30,9 +30,21 @@ describe OpenStudio::Analysis::SupportFiles do
     expect(@s.size).to eq 0
   end
 
-  it 'should only add existing files'
+  it 'should only add existing files' do
+    f = 'spec/files/worker_init/second_file.rb'
+    @s.add(f)
+    @s.add(f)
+
+    expect(@s.size).to eq 1
+
+    f = 'non-existent.rb'
+    expect{@s.add(f)}.to raise_error /Path or file does not exist and cannot be added.*/
+  end
+
+  it 'should add metadata data' do
+
+  end
 
-  it 'should add metadata data'
 
   it 'should add a directory' do
     @s.clear

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-analysis
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.rc3
+  version: 1.0.0.pre.rc4
 platform: ruby
 authors:
 - Nicholas Long