openstudio-analysis 0.3.4 → 0.3.5

data/spec/files/measures/ExampleMeasure/measure.rb

@@ -1,7 +1,5 @@
 class ExampleMeasure < OpenStudio::Ruleset::ModelUserScript
-
   # not a real measure
-
 end # end the measure
 
 IncreaseInsulationRValueForRoofs.new.registerWithApplication

data/spec/files/measures/IncreaseInsulationRValueForRoofs/measure.rb

@@ -6,7 +6,7 @@ class IncreaseInsulationRValueForRoofs < OpenStudio::Ruleset::ModelUserScript
   end
 
   # define the arguments that the user will input
-  def arguments(model)
+  def arguments(_model)
     args = OpenStudio::Ruleset::OSArgumentVector.new
   end # end the arguments method
 

data/spec/files/measures/ReduceLightingLoadsByPercentage/measure.rb

@@ -1,7 +1,5 @@
 class ExampleMeasure < OpenStudio::Ruleset::ModelUserScript
-
   # not a real measure
-
 end # end the measure
 
 IncreaseInsulationRValueForRoofs.new.registerWithApplication

data/spec/files/measures/example_measure_auto_directory_name/measure.rb

@@ -1,7 +1,5 @@
 class ExampleMeasure < OpenStudio::Ruleset::ModelUserScript
-
   # not a real measure
-
 end # end the measure
 
 IncreaseInsulationRValueForRoofs.new.registerWithApplication

data/spec/files/measures/reduce_lighting_loads_by_percentage/measure.rb

@@ -1,7 +1,5 @@
 class ExampleMeasure < OpenStudio::Ruleset::ModelUserScript
-
   # not a real measure
-
 end # end the measure
 
 IncreaseInsulationRValueForRoofs.new.registerWithApplication

data/spec/integration/server_api_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe OpenStudio::Analysis::ServerApi, type: :integration do
+  before :all do
+    @host = 'http://localhost:8080'
+  end
+
+  context 'create and delete a project', type: :api_integration do
+    before :all do
+      @api = OpenStudio::Analysis::ServerApi.new
+      expect(@api.hostname).to eq(@host)
+    end
+
+    it 'should create the project' do
+      project_id = @api.new_project({})
+      expect(project_id).to match /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/
+
+      # get the projects from the api
+      project_ids = @api.get_project_ids
+      expect(project_ids.include?(project_id)).to eq true
+
+      # delete the project
+      r = @api.delete_project project_id
+      expect(r).to be true
+    end
+
+    it 'should not be able to delete a non-existent project' do
+      r = @api.delete_project('not_a_uuid')
+      expect(r).to eq false
+    end
+
+    it 'create multiple projects and then delete them all' do
+      (1..20).each do |_p|
+        project_id = @api.new_project({})
+        expect(project_id).to match /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/
+      end
+
+      r = @api.delete_all
+      expect(r).to eq true
+    end
+
+    it 'should upload an analysis' do
+      puts Dir.pwd
+      j = 'spec/files/analysis/medium_office.json'
+      z = 'spec/files/analysis/medium_office.zip'
+    end
+  end
+end

data/spec/openstudio/{analysis/translator/excel_spec.rb → excel_spec.rb}

@@ -88,7 +88,7 @@ describe OpenStudio::Analysis::Translator::Excel do
     it 'should have a weather file' do
       expect(@excel.weather_files.first).not_to be_nil
       puts @excel.weather_files.first
-      expect(@excel.weather_files.first.include?('partial_weather.epw')).to eq(true)
+      expect(@excel.weather_files.first.include?('partial_weather')).to eq(true)
     end
 
     it 'should have notes and source' do
@@ -119,9 +119,9 @@ describe OpenStudio::Analysis::Translator::Excel do
       @excel.process
     end
 
-    it 'should have a version and machine name' do
+    it 'should have a version and analysis name in machine format' do
       expect(@excel.version).to eq('0.1.9')
-      expect(@excel.machine_name).to eq('example_analysis')
+      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')
@@ -186,8 +186,8 @@ describe OpenStudio::Analysis::Translator::Excel do
           if var['name'] == 'alter_design_days'
             puts var.inspect
             expect(var['type']).to eq 'bool'
-            expect(eval(var['distribution']['discrete_values'])).to match_array ["true", "false"]
-            expect(eval(var['distribution']['discrete_weights'])).to match_array [0.8,0.2]
+            expect(eval(var['distribution']['discrete_values'])).to match_array %w(true false)
+            expect(eval(var['distribution']['discrete_weights'])).to match_array [0.8, 0.2]
           end
         end
       end
@@ -208,7 +208,7 @@ describe OpenStudio::Analysis::Translator::Excel do
 
     it 'should have parsed the spreadsheet' do
       @excel.variables['data'].each do |measure|
-        measure['variables'].each do |var|
+        measure['variables'].each do |_var|
           # TODO: test something?
         end
       end
@@ -235,7 +235,7 @@ describe OpenStudio::Analysis::Translator::Excel do
     it 'should have a weather file' do
       expect(@excel.weather_files.first).not_to be_nil
       puts @excel.weather_files.first
-      expect(@excel.weather_files.first.include?('partial_weather.epw')).to eq(true)
+      expect(@excel.weather_files.first.include?('partial_weather')).to eq(true)
     end
 
     it 'should have notes and source' do
@@ -403,7 +403,7 @@ describe OpenStudio::Analysis::Translator::Excel do
       # 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 eq './weather/partial_weather.epw'
+      expect(h['analysis']['weather_file']['path']).to match /partial_weather.*epw/
     end
   end
 
@@ -420,7 +420,7 @@ describe OpenStudio::Analysis::Translator::Excel do
     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.*$/
+      expect { @excel.save_analysis }.to raise_error /Measure in directory.*not contain a measure.rb.*$/
     end
   end
 
@@ -463,18 +463,18 @@ describe OpenStudio::Analysis::Translator::Excel do
       expect(File.exist?("spec/files/export/analysis/#{model_uuid}.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'
+        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/#{model_uuid}.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"
+      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
 end

data/spec/openstudio/{analysis/server_api_spec.rb → server_api_spec.rb}

@@ -1,13 +1,17 @@
 require 'spec_helper'
 
 describe OpenStudio::Analysis::ServerApi do
-  context 'create a new localhost instance' do
+  before :all do
+    @host = 'http://localhost:8080'
+  end
+
+  context 'create a new object instance' do
     before(:all) do
       @api = OpenStudio::Analysis::ServerApi.new
     end
 
     it 'should set the default host to localhost' do
-      expect(@api.hostname).to eq('http://localhost:8080')
+      expect(@api.hostname).to eq(@host)
     end
   end
 

data/spec/reports/SPEC-OpenStudio-Analysis-ServerApi-create-a-new-object-instance.0.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudio::Analysis::ServerApi create a new object instance" tests="1" time="0.042418" failures="0" errors="0" skipped="0" timestamp="2014-08-11T13:58:34-06:00">
+  <testcase name="OpenStudio::Analysis::ServerApi create a new object instance should set the default host to localhost" time="0.000216">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/spec/reports/SPEC-OpenStudio-Analysis-ServerApi-create-a-new-object-instance.1.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudio::Analysis::ServerApi create a new object instance" tests="1" time="0.015092" failures="0" errors="0" skipped="0" timestamp="2014-08-11T13:59:44-06:00">
+  <testcase name="OpenStudio::Analysis::ServerApi create a new object instance should set the default host to localhost" time="0.000205">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/spec/reports/SPEC-OpenStudio-Analysis-ServerApi-create-a-new-object-instance.2.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudio::Analysis::ServerApi create a new object instance" tests="1" time="0.015601" failures="0" errors="0" skipped="0" timestamp="2014-09-05T06:00:14-06:00">
+  <testcase name="OpenStudio::Analysis::ServerApi create a new object instance should set the default host to localhost" time="0.000232">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/spec/reports/SPEC-OpenStudio-Analysis-ServerApi-create-a-new-object-instance.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudio::Analysis::ServerApi create a new object instance" tests="1" time="0.043473" failures="0" errors="0" skipped="0" timestamp="2014-08-11T13:56:28-06:00">
+  <testcase name="OpenStudio::Analysis::ServerApi create a new object instance should set the default host to localhost" time="0.000216">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/spec/reports/SPEC-OpenStudio-Analysis-ServerApi-test-not-localhost.0.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="OpenStudio::Analysis::ServerApi test not localhost" tests="1" time="0.001155" failures="0" errors="0" skipped="0" timestamp="2014-06-10T15:47:41-06:00">
-  <testcase name="OpenStudio::Analysis::ServerApi test not localhost should have a not localhost URL" time="0.000697">
+<testsuite name="OpenStudio::Analysis::ServerApi test not localhost" tests="1" time="0.000811" failures="0" errors="0" skipped="0" timestamp="2014-08-11T13:58:34-06:00">
+  <testcase name="OpenStudio::Analysis::ServerApi test not localhost should have a not localhost URL" time="0.000412">
   </testcase>
   <system-out>
   </system-out>

data/spec/reports/SPEC-OpenStudio-Analysis-ServerApi-test-not-localhost.1.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="OpenStudio::Analysis::ServerApi test not localhost" tests="1" time="0.000749" failures="0" errors="0" skipped="0" timestamp="2014-06-10T16:09:04-06:00">
-  <testcase name="OpenStudio::Analysis::ServerApi test not localhost should have a not localhost URL" time="0.000491">
+<testsuite name="OpenStudio::Analysis::ServerApi test not localhost" tests="1" time="0.000867" failures="0" errors="0" skipped="0" timestamp="2014-08-11T13:59:44-06:00">
+  <testcase name="OpenStudio::Analysis::ServerApi test not localhost should have a not localhost URL" time="0.000499">
   </testcase>
   <system-out>
   </system-out>

data/spec/reports/SPEC-OpenStudio-Analysis-ServerApi-test-not-localhost.2.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="OpenStudio::Analysis::ServerApi test not localhost" tests="1" time="0.000908" failures="0" errors="0" skipped="0" timestamp="2014-06-11T07:45:54-06:00">
-  <testcase name="OpenStudio::Analysis::ServerApi test not localhost should have a not localhost URL" time="0.000579">
+<testsuite name="OpenStudio::Analysis::ServerApi test not localhost" tests="1" time="0.000764" failures="0" errors="0" skipped="0" timestamp="2014-09-05T06:00:14-06:00">
+  <testcase name="OpenStudio::Analysis::ServerApi test not localhost should have a not localhost URL" time="0.000421">
   </testcase>
   <system-out>
   </system-out>

data/spec/reports/SPEC-OpenStudio-Analysis-ServerApi-test-not-localhost.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="OpenStudio::Analysis::ServerApi test not localhost" tests="1" time="0.000786" failures="0" errors="0" skipped="0" timestamp="2014-06-10T14:29:45-06:00">
-  <testcase name="OpenStudio::Analysis::ServerApi test not localhost should have a not localhost URL" time="0.000518">
+<testsuite name="OpenStudio::Analysis::ServerApi test not localhost" tests="1" time="0.000843" failures="0" errors="0" skipped="0" timestamp="2014-08-11T13:56:28-06:00">
+  <testcase name="OpenStudio::Analysis::ServerApi test not localhost should have a not localhost URL" time="0.000486">
   </testcase>
   <system-out>
   </system-out>

data/spec/reports/SPEC-OpenStudio-Analysis-ServerApi.0.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="OpenStudio::Analysis::ServerApi" tests="0" time="0.0002" failures="0" errors="0" skipped="0" timestamp="2014-06-10T15:47:41-06:00">
+<testsuite name="OpenStudio::Analysis::ServerApi" tests="0" time="0.00013" failures="0" errors="0" skipped="0" timestamp="2014-08-11T13:58:34-06:00">
   <system-out>
   </system-out>
   <system-err>

data/spec/reports/SPEC-OpenStudio-Analysis-ServerApi.1.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="OpenStudio::Analysis::ServerApi" tests="0" time="0.00016" failures="0" errors="0" skipped="0" timestamp="2014-06-10T16:09:04-06:00">
+<testsuite name="OpenStudio::Analysis::ServerApi" tests="0" time="0.000132" failures="0" errors="0" skipped="0" timestamp="2014-08-11T13:59:44-06:00">
   <system-out>
   </system-out>
   <system-err>

data/spec/reports/SPEC-OpenStudio-Analysis-ServerApi.2.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="OpenStudio::Analysis::ServerApi" tests="0" time="0.000185" failures="0" errors="0" skipped="0" timestamp="2014-06-11T07:45:54-06:00">
+<testsuite name="OpenStudio::Analysis::ServerApi" tests="0" time="0.000231" failures="0" errors="0" skipped="0" timestamp="2014-09-05T06:00:14-06:00">
   <system-out>
   </system-out>
   <system-err>

data/spec/reports/SPEC-OpenStudio-Analysis-ServerApi.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="OpenStudio::Analysis::ServerApi" tests="0" time="0.00017" failures="0" errors="0" skipped="0" timestamp="2014-06-10T14:29:45-06:00">
+<testsuite name="OpenStudio::Analysis::ServerApi" tests="0" time="0.000133" failures="0" errors="0" skipped="0" timestamp="2014-08-11T13:56:28-06:00">
   <system-out>
   </system-out>
   <system-err>

data/spec/reports/SPEC-OpenStudio-Analysis-Translator-Excel-discrete-variables.0.xml

@@ -1,24 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="OpenStudio::Analysis::Translator::Excel discrete variables" tests="2" time="0.386986" failures="0" errors="2" skipped="0" timestamp="2014-06-10T15:47:45-06:00">
-  <testcase name="OpenStudio::Analysis::Translator::Excel discrete variables should have parsed the spreadsheet" time="0.000108">
-    <failure type="NoMethodError" message="undefined method `map' for 1:Fixnum">
-undefined method `map' for 1:Fixnum (NoMethodError)
-NoMethodError:
-undefined method `map' for 1:Fixnum
-     ./lib/openstudio/analysis/translator/excel.rb:798:in `parse_outputs'
-     ./lib/openstudio/analysis/translator/excel.rb:66:in `process'
-     ./spec/openstudio/analysis/translator/excel_spec.rb:172:in `block (3 levels) in &lt;top (required)&gt;'    </failure>
+<testsuite name="OpenStudio::Analysis::Translator::Excel discrete variables" tests="2" time="0.482621" failures="0" errors="0" skipped="0" timestamp="2014-08-11T13:58:28-06:00">
+  <testcase name="OpenStudio::Analysis::Translator::Excel discrete variables should have parsed the spreadsheet" time="0.000328">
   </testcase>
-  <testcase name="OpenStudio::Analysis::Translator::Excel discrete variables should save the file" time="4.8e-05">
-    <failure type="NoMethodError" message="undefined method `map' for 1:Fixnum">
-undefined method `map' for 1:Fixnum (NoMethodError)
-NoMethodError:
-undefined method `map' for 1:Fixnum
-     ./lib/openstudio/analysis/translator/excel.rb:798:in `parse_outputs'
-     ./lib/openstudio/analysis/translator/excel.rb:66:in `process'
-     ./spec/openstudio/analysis/translator/excel_spec.rb:172:in `block (3 levels) in &lt;top (required)&gt;'    </failure>
+  <testcase name="OpenStudio::Analysis::Translator::Excel discrete variables should save the file" time="0.059513">
   </testcase>
   <system-out>
+{"variable_type"=&gt;"variable", "display_name"=&gt;"Alter Design Day Thermostats?", "display_name_short"=&gt;"Alter Design Day Thermostats?", "name"=&gt;"alter_design_days", "index"=&gt;3, "type"=&gt;"bool", "units"=&gt;nil, "distribution"=&gt;{"enumerations"=&gt;["true", "false"], "min"=&gt;"true", "max"=&gt;"true", "mean"=&gt;"false", "stddev"=&gt;"false", "discrete_values"=&gt;"['true','false']", "discrete_weights"=&gt;"[0.8,0.2]", "type"=&gt;"discrete_uncertain", "static_value"=&gt;"FALSE", "source"=&gt;nil}, "notes"=&gt;nil, "relation_to_eui"=&gt;nil}
+Creating JSON and ZIP file for Example Analysis:0_1_11_discrete_variables
+  Adding measure /Users/nlong/working/OpenStudio-analysis-gem/spec/files/measures/reduce_lighting_loads_by_percentage to zip file
+  Adding measure /Users/nlong/working/OpenStudio-analysis-gem/spec/files/measures/example_measure_auto_directory_name to zip file
   </system-out>
   <system-err>
   </system-err>

data/spec/reports/SPEC-OpenStudio-Analysis-Translator-Excel-discrete-variables.1.xml

@@ -1,24 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="OpenStudio::Analysis::Translator::Excel discrete variables" tests="2" time="0.406697" failures="0" errors="2" skipped="0" timestamp="2014-06-10T16:09:07-06:00">
-  <testcase name="OpenStudio::Analysis::Translator::Excel discrete variables should have parsed the spreadsheet" time="0.000107">
-    <failure type="NoMethodError" message="undefined method `map' for 1:Fixnum">
-undefined method `map' for 1:Fixnum (NoMethodError)
-NoMethodError:
-undefined method `map' for 1:Fixnum
-     ./lib/openstudio/analysis/translator/excel.rb:798:in `parse_outputs'
-     ./lib/openstudio/analysis/translator/excel.rb:66:in `process'
-     ./spec/openstudio/analysis/translator/excel_spec.rb:173:in `block (3 levels) in &lt;top (required)&gt;'    </failure>
+<testsuite name="OpenStudio::Analysis::Translator::Excel discrete variables" tests="2" time="0.479354" failures="0" errors="0" skipped="0" timestamp="2014-08-11T13:59:38-06:00">
+  <testcase name="OpenStudio::Analysis::Translator::Excel discrete variables should have parsed the spreadsheet" time="0.00033">
   </testcase>
-  <testcase name="OpenStudio::Analysis::Translator::Excel discrete variables should save the file" time="4.8e-05">
-    <failure type="NoMethodError" message="undefined method `map' for 1:Fixnum">
-undefined method `map' for 1:Fixnum (NoMethodError)
-NoMethodError:
-undefined method `map' for 1:Fixnum
-     ./lib/openstudio/analysis/translator/excel.rb:798:in `parse_outputs'
-     ./lib/openstudio/analysis/translator/excel.rb:66:in `process'
-     ./spec/openstudio/analysis/translator/excel_spec.rb:173:in `block (3 levels) in &lt;top (required)&gt;'    </failure>
+  <testcase name="OpenStudio::Analysis::Translator::Excel discrete variables should save the file" time="0.064515">
   </testcase>
   <system-out>
+{"variable_type"=&gt;"variable", "display_name"=&gt;"Alter Design Day Thermostats?", "display_name_short"=&gt;"Alter Design Day Thermostats?", "name"=&gt;"alter_design_days", "index"=&gt;3, "type"=&gt;"bool", "units"=&gt;nil, "distribution"=&gt;{"enumerations"=&gt;["true", "false"], "min"=&gt;"true", "max"=&gt;"true", "mean"=&gt;"false", "stddev"=&gt;"false", "discrete_values"=&gt;"['true','false']", "discrete_weights"=&gt;"[0.8,0.2]", "type"=&gt;"discrete_uncertain", "static_value"=&gt;"FALSE", "source"=&gt;nil}, "notes"=&gt;nil, "relation_to_eui"=&gt;nil}
+Creating JSON and ZIP file for Example Analysis:0_1_11_discrete_variables
+  Adding measure /Users/nlong/working/OpenStudio-analysis-gem/spec/files/measures/reduce_lighting_loads_by_percentage to zip file
+  Adding measure /Users/nlong/working/OpenStudio-analysis-gem/spec/files/measures/example_measure_auto_directory_name to zip file
   </system-out>
   <system-err>
   </system-err>

data/spec/reports/SPEC-OpenStudio-Analysis-Translator-Excel-discrete-variables.2.xml

@@ -1,24 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="OpenStudio::Analysis::Translator::Excel discrete variables" tests="2" time="0.479388" failures="0" errors="2" skipped="0" timestamp="2014-06-11T07:45:59-06:00">
-  <testcase name="OpenStudio::Analysis::Translator::Excel discrete variables should have parsed the spreadsheet" time="0.000121">
-    <failure type="NoMethodError" message="undefined method `map' for 1:Fixnum">
-undefined method `map' for 1:Fixnum (NoMethodError)
-NoMethodError:
-undefined method `map' for 1:Fixnum
-     ./lib/openstudio/analysis/translator/excel.rb:798:in `parse_outputs'
-     ./lib/openstudio/analysis/translator/excel.rb:66:in `process'
-     ./spec/openstudio/analysis/translator/excel_spec.rb:172:in `block (3 levels) in &lt;top (required)&gt;'    </failure>
+<testsuite name="OpenStudio::Analysis::Translator::Excel discrete variables" tests="2" time="0.442221" failures="0" errors="0" skipped="0" timestamp="2014-09-05T06:00:08-06:00">
+  <testcase name="OpenStudio::Analysis::Translator::Excel discrete variables should have parsed the spreadsheet" time="0.00036">
   </testcase>
-  <testcase name="OpenStudio::Analysis::Translator::Excel discrete variables should save the file" time="4.5e-05">
-    <failure type="NoMethodError" message="undefined method `map' for 1:Fixnum">
-undefined method `map' for 1:Fixnum (NoMethodError)
-NoMethodError:
-undefined method `map' for 1:Fixnum
-     ./lib/openstudio/analysis/translator/excel.rb:798:in `parse_outputs'
-     ./lib/openstudio/analysis/translator/excel.rb:66:in `process'
-     ./spec/openstudio/analysis/translator/excel_spec.rb:172:in `block (3 levels) in &lt;top (required)&gt;'    </failure>
+  <testcase name="OpenStudio::Analysis::Translator::Excel discrete variables should save the file" time="0.037392">
   </testcase>
   <system-out>
+{"variable_type"=&gt;"variable", "display_name"=&gt;"Alter Design Day Thermostats?", "display_name_short"=&gt;"Alter Design Day Thermostats?", "name"=&gt;"alter_design_days", "index"=&gt;3, "type"=&gt;"bool", "units"=&gt;nil, "distribution"=&gt;{"enumerations"=&gt;["true", "false"], "min"=&gt;"true", "max"=&gt;"true", "mean"=&gt;"false", "stddev"=&gt;"false", "discrete_values"=&gt;"['true','false']", "discrete_weights"=&gt;"[0.8,0.2]", "type"=&gt;"discrete_uncertain", "static_value"=&gt;"FALSE", "source"=&gt;nil}, "notes"=&gt;nil, "relation_to_eui"=&gt;nil}
+Creating JSON and ZIP file for Example Analysis:0_1_11_discrete_variables
+  Adding measure /Users/nlong/working/OpenStudio-analysis-gem/spec/files/measures/reduce_lighting_loads_by_percentage to zip file
+  Adding measure /Users/nlong/working/OpenStudio-analysis-gem/spec/files/measures/example_measure_auto_directory_name to zip file
   </system-out>
   <system-err>
   </system-err>

data/spec/reports/SPEC-OpenStudio-Analysis-Translator-Excel-discrete-variables.xml

@@ -1,24 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="OpenStudio::Analysis::Translator::Excel discrete variables" tests="2" time="0.399078" failures="0" errors="2" skipped="0" timestamp="2014-06-10T14:29:49-06:00">
-  <testcase name="OpenStudio::Analysis::Translator::Excel discrete variables should have parsed the spreadsheet" time="0.000106">
-    <failure type="NoMethodError" message="undefined method `map' for 1:Fixnum">
-undefined method `map' for 1:Fixnum (NoMethodError)
-NoMethodError:
-undefined method `map' for 1:Fixnum
-     ./lib/openstudio/analysis/translator/excel.rb:798:in `parse_outputs'
-     ./lib/openstudio/analysis/translator/excel.rb:66:in `process'
-     ./spec/openstudio/analysis/translator/excel_spec.rb:172:in `block (3 levels) in &lt;top (required)&gt;'    </failure>
+<testsuite name="OpenStudio::Analysis::Translator::Excel discrete variables" tests="2" time="0.452278" failures="0" errors="0" skipped="0" timestamp="2014-08-11T13:56:22-06:00">
+  <testcase name="OpenStudio::Analysis::Translator::Excel discrete variables should have parsed the spreadsheet" time="0.000337">
   </testcase>
-  <testcase name="OpenStudio::Analysis::Translator::Excel discrete variables should save the file" time="3.7e-05">
-    <failure type="NoMethodError" message="undefined method `map' for 1:Fixnum">
-undefined method `map' for 1:Fixnum (NoMethodError)
-NoMethodError:
-undefined method `map' for 1:Fixnum
-     ./lib/openstudio/analysis/translator/excel.rb:798:in `parse_outputs'
-     ./lib/openstudio/analysis/translator/excel.rb:66:in `process'
-     ./spec/openstudio/analysis/translator/excel_spec.rb:172:in `block (3 levels) in &lt;top (required)&gt;'    </failure>
+  <testcase name="OpenStudio::Analysis::Translator::Excel discrete variables should save the file" time="0.06599">
   </testcase>
   <system-out>
+{"variable_type"=&gt;"variable", "display_name"=&gt;"Alter Design Day Thermostats?", "display_name_short"=&gt;"Alter Design Day Thermostats?", "name"=&gt;"alter_design_days", "index"=&gt;3, "type"=&gt;"bool", "units"=&gt;nil, "distribution"=&gt;{"enumerations"=&gt;["true", "false"], "min"=&gt;"true", "max"=&gt;"true", "mean"=&gt;"false", "stddev"=&gt;"false", "discrete_values"=&gt;"['true','false']", "discrete_weights"=&gt;"[0.8,0.2]", "type"=&gt;"discrete_uncertain", "static_value"=&gt;"FALSE", "source"=&gt;nil}, "notes"=&gt;nil, "relation_to_eui"=&gt;nil}
+Creating JSON and ZIP file for Example Analysis:0_1_11_discrete_variables
+  Adding measure /Users/nlong/working/OpenStudio-analysis-gem/spec/files/measures/reduce_lighting_loads_by_percentage to zip file
+  Adding measure /Users/nlong/working/OpenStudio-analysis-gem/spec/files/measures/example_measure_auto_directory_name to zip file
   </system-out>
   <system-err>
   </system-err>

data/spec/reports/SPEC-OpenStudio-Analysis-Translator-Excel-discrete-with-dynamic-columns.0.xml

@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="OpenStudio::Analysis::Translator::Excel discrete with dynamic columns" tests="2" time="0.418873" failures="0" errors="0" skipped="0" timestamp="2014-06-10T15:47:45-06:00">
-  <testcase name="OpenStudio::Analysis::Translator::Excel discrete with dynamic columns should have parsed the spreadsheet" time="0.000315">
+<testsuite name="OpenStudio::Analysis::Translator::Excel discrete with dynamic columns" tests="2" time="0.389854" failures="0" errors="0" skipped="0" timestamp="2014-08-11T13:58:29-06:00">
+  <testcase name="OpenStudio::Analysis::Translator::Excel discrete with dynamic columns should have parsed the spreadsheet" time="0.000244">
   </testcase>
-  <testcase name="OpenStudio::Analysis::Translator::Excel discrete with dynamic columns should save the file" time="0.044613">
+  <testcase name="OpenStudio::Analysis::Translator::Excel discrete with dynamic columns should save the file" time="0.037108">
   </testcase>
   <system-out>
-{"variable_type"=&gt;"argument", "display_name"=&gt;"Baseline", "machine_name"=&gt;"baseline", "name"=&gt;"Baseline", "index"=&gt;1, "type"=&gt;nil, "units"=&gt;nil, "distribution"=&gt;{"min"=&gt;nil, "max"=&gt;nil, "mean"=&gt;nil, "stddev"=&gt;nil, "discrete_values"=&gt;nil, "discrete_weights"=&gt;nil, "type"=&gt;nil, "static_value"=&gt;nil, "source"=&gt;nil}, "notes"=&gt;nil, "relation_to_eui"=&gt;nil}
-{"variable_type"=&gt;"variable", "display_name"=&gt;"Degrees Fahrenheit to Adjust Cooling Setpoint By.", "machine_name"=&gt;"degrees_fahrenheit_to_adjust_cooling_setpoint_by.", "name"=&gt;"cooling_adjustment", "index"=&gt;1, "type"=&gt;"double", "units"=&gt;nil, "distribution"=&gt;{"min"=&gt;0.0, "max"=&gt;5.0, "mean"=&gt;5.0, "stddev"=&gt;nil, "discrete_values"=&gt;"[-2,0,2]", "discrete_weights"=&gt;"[0.33,0.33,0.33]", "type"=&gt;"discrete_uncertain", "static_value"=&gt;0.0, "source"=&gt;nil}, "notes"=&gt;nil, "relation_to_eui"=&gt;nil}
-{"variable_type"=&gt;"variable", "display_name"=&gt;"Degrees Fahrenheit to Adjust heating Setpoint By.", "machine_name"=&gt;"degrees_fahrenheit_to_adjust_heating_setpoint_by.", "name"=&gt;"heating_adjustment", "index"=&gt;2, "type"=&gt;"double", "units"=&gt;nil, "distribution"=&gt;{"min"=&gt;0.0, "max"=&gt;5.0, "mean"=&gt;4.0, "stddev"=&gt;nil, "discrete_values"=&gt;"[-2,0,2]", "discrete_weights"=&gt;"[0.33,0.33,0.33]", "type"=&gt;"discrete_uncertain", "static_value"=&gt;0.0, "source"=&gt;nil}, "notes"=&gt;nil, "relation_to_eui"=&gt;nil}
-{"variable_type"=&gt;"argument", "display_name"=&gt;"Alter Design Day Thermostats?", "machine_name"=&gt;"alter_design_day_thermostats?", "name"=&gt;"alter_design_days", "index"=&gt;3, "type"=&gt;"bool", "units"=&gt;nil, "distribution"=&gt;{"enumerations"=&gt;["true", "false"], "min"=&gt;nil, "max"=&gt;nil, "mean"=&gt;nil, "stddev"=&gt;nil, "discrete_values"=&gt;nil, "discrete_weights"=&gt;nil, "type"=&gt;nil, "static_value"=&gt;"FALSE", "source"=&gt;nil}, "notes"=&gt;nil, "relation_to_eui"=&gt;nil}
-Analysis name is test_model
-  Adding measure item 'adjust_thermostat_setpoints_by_degrees'
+Creating JSON and ZIP file for test_model:0_1_12_discrete_dynamic_columns
+  Adding measure /Users/nlong/working/OpenStudio-analysis-gem/spec/files/measures/example_measure_auto_directory_name to zip file
   </system-out>
   <system-err>
   </system-err>

data/spec/reports/SPEC-OpenStudio-Analysis-Translator-Excel-discrete-with-dynamic-columns.1.xml

@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="OpenStudio::Analysis::Translator::Excel discrete with dynamic columns" tests="2" time="0.39531" failures="0" errors="0" skipped="0" timestamp="2014-06-10T16:09:08-06:00">
-  <testcase name="OpenStudio::Analysis::Translator::Excel discrete with dynamic columns should have parsed the spreadsheet" time="0.00031">
+<testsuite name="OpenStudio::Analysis::Translator::Excel discrete with dynamic columns" tests="2" time="0.390985" failures="0" errors="0" skipped="0" timestamp="2014-08-11T13:59:39-06:00">
+  <testcase name="OpenStudio::Analysis::Translator::Excel discrete with dynamic columns should have parsed the spreadsheet" time="0.000205">
   </testcase>
-  <testcase name="OpenStudio::Analysis::Translator::Excel discrete with dynamic columns should save the file" time="0.029275">
+  <testcase name="OpenStudio::Analysis::Translator::Excel discrete with dynamic columns should save the file" time="0.03478">
   </testcase>
   <system-out>
-{"variable_type"=&gt;"argument", "display_name"=&gt;"Baseline", "machine_name"=&gt;"baseline", "name"=&gt;"Baseline", "index"=&gt;1, "type"=&gt;nil, "units"=&gt;nil, "distribution"=&gt;{"min"=&gt;nil, "max"=&gt;nil, "mean"=&gt;nil, "stddev"=&gt;nil, "discrete_values"=&gt;nil, "discrete_weights"=&gt;nil, "type"=&gt;nil, "static_value"=&gt;nil, "source"=&gt;nil}, "notes"=&gt;nil, "relation_to_eui"=&gt;nil}
-{"variable_type"=&gt;"variable", "display_name"=&gt;"Degrees Fahrenheit to Adjust Cooling Setpoint By.", "machine_name"=&gt;"degrees_fahrenheit_to_adjust_cooling_setpoint_by.", "name"=&gt;"cooling_adjustment", "index"=&gt;1, "type"=&gt;"double", "units"=&gt;nil, "distribution"=&gt;{"min"=&gt;0.0, "max"=&gt;5.0, "mean"=&gt;5.0, "stddev"=&gt;nil, "discrete_values"=&gt;"[-2,0,2]", "discrete_weights"=&gt;"[0.33,0.33,0.33]", "type"=&gt;"discrete_uncertain", "static_value"=&gt;0.0, "source"=&gt;nil}, "notes"=&gt;nil, "relation_to_eui"=&gt;nil}
-{"variable_type"=&gt;"variable", "display_name"=&gt;"Degrees Fahrenheit to Adjust heating Setpoint By.", "machine_name"=&gt;"degrees_fahrenheit_to_adjust_heating_setpoint_by.", "name"=&gt;"heating_adjustment", "index"=&gt;2, "type"=&gt;"double", "units"=&gt;nil, "distribution"=&gt;{"min"=&gt;0.0, "max"=&gt;5.0, "mean"=&gt;4.0, "stddev"=&gt;nil, "discrete_values"=&gt;"[-2,0,2]", "discrete_weights"=&gt;"[0.33,0.33,0.33]", "type"=&gt;"discrete_uncertain", "static_value"=&gt;0.0, "source"=&gt;nil}, "notes"=&gt;nil, "relation_to_eui"=&gt;nil}
-{"variable_type"=&gt;"argument", "display_name"=&gt;"Alter Design Day Thermostats?", "machine_name"=&gt;"alter_design_day_thermostats?", "name"=&gt;"alter_design_days", "index"=&gt;3, "type"=&gt;"bool", "units"=&gt;nil, "distribution"=&gt;{"enumerations"=&gt;["true", "false"], "min"=&gt;nil, "max"=&gt;nil, "mean"=&gt;nil, "stddev"=&gt;nil, "discrete_values"=&gt;nil, "discrete_weights"=&gt;nil, "type"=&gt;nil, "static_value"=&gt;"FALSE", "source"=&gt;nil}, "notes"=&gt;nil, "relation_to_eui"=&gt;nil}
-Analysis name is test_model
-  Adding measure item 'adjust_thermostat_setpoints_by_degrees'
+Creating JSON and ZIP file for test_model:0_1_12_discrete_dynamic_columns
+  Adding measure /Users/nlong/working/OpenStudio-analysis-gem/spec/files/measures/example_measure_auto_directory_name to zip file
   </system-out>
   <system-err>
   </system-err>

data/spec/reports/SPEC-OpenStudio-Analysis-Translator-Excel-discrete-with-dynamic-columns.2.xml

@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="OpenStudio::Analysis::Translator::Excel discrete with dynamic columns" tests="2" time="0.446176" failures="0" errors="0" skipped="0" timestamp="2014-06-11T07:45:59-06:00">
-  <testcase name="OpenStudio::Analysis::Translator::Excel discrete with dynamic columns should have parsed the spreadsheet" time="0.000353">
+<testsuite name="OpenStudio::Analysis::Translator::Excel discrete with dynamic columns" tests="2" time="0.405253" failures="0" errors="0" skipped="0" timestamp="2014-09-05T06:00:08-06:00">
+  <testcase name="OpenStudio::Analysis::Translator::Excel discrete with dynamic columns should have parsed the spreadsheet" time="0.000219">
   </testcase>
-  <testcase name="OpenStudio::Analysis::Translator::Excel discrete with dynamic columns should save the file" time="0.030135">
+  <testcase name="OpenStudio::Analysis::Translator::Excel discrete with dynamic columns should save the file" time="0.028156">
   </testcase>
   <system-out>
-{"variable_type"=&gt;"argument", "display_name"=&gt;"Baseline", "machine_name"=&gt;"baseline", "name"=&gt;"Baseline", "index"=&gt;1, "type"=&gt;nil, "units"=&gt;nil, "distribution"=&gt;{"min"=&gt;nil, "max"=&gt;nil, "mean"=&gt;nil, "stddev"=&gt;nil, "discrete_values"=&gt;nil, "discrete_weights"=&gt;nil, "type"=&gt;nil, "static_value"=&gt;nil, "source"=&gt;nil}, "notes"=&gt;nil, "relation_to_eui"=&gt;nil}
-{"variable_type"=&gt;"variable", "display_name"=&gt;"Degrees Fahrenheit to Adjust Cooling Setpoint By.", "machine_name"=&gt;"degrees_fahrenheit_to_adjust_cooling_setpoint_by.", "name"=&gt;"cooling_adjustment", "index"=&gt;1, "type"=&gt;"double", "units"=&gt;nil, "distribution"=&gt;{"min"=&gt;0.0, "max"=&gt;5.0, "mean"=&gt;5.0, "stddev"=&gt;nil, "discrete_values"=&gt;"[-2,0,2]", "discrete_weights"=&gt;"[0.33,0.33,0.33]", "type"=&gt;"discrete_uncertain", "static_value"=&gt;0.0, "source"=&gt;nil}, "notes"=&gt;nil, "relation_to_eui"=&gt;nil}
-{"variable_type"=&gt;"variable", "display_name"=&gt;"Degrees Fahrenheit to Adjust heating Setpoint By.", "machine_name"=&gt;"degrees_fahrenheit_to_adjust_heating_setpoint_by.", "name"=&gt;"heating_adjustment", "index"=&gt;2, "type"=&gt;"double", "units"=&gt;nil, "distribution"=&gt;{"min"=&gt;0.0, "max"=&gt;5.0, "mean"=&gt;4.0, "stddev"=&gt;nil, "discrete_values"=&gt;"[-2,0,2]", "discrete_weights"=&gt;"[0.33,0.33,0.33]", "type"=&gt;"discrete_uncertain", "static_value"=&gt;0.0, "source"=&gt;nil}, "notes"=&gt;nil, "relation_to_eui"=&gt;nil}
-{"variable_type"=&gt;"argument", "display_name"=&gt;"Alter Design Day Thermostats?", "machine_name"=&gt;"alter_design_day_thermostats?", "name"=&gt;"alter_design_days", "index"=&gt;3, "type"=&gt;"bool", "units"=&gt;nil, "distribution"=&gt;{"enumerations"=&gt;["true", "false"], "min"=&gt;nil, "max"=&gt;nil, "mean"=&gt;nil, "stddev"=&gt;nil, "discrete_values"=&gt;nil, "discrete_weights"=&gt;nil, "type"=&gt;nil, "static_value"=&gt;"FALSE", "source"=&gt;nil}, "notes"=&gt;nil, "relation_to_eui"=&gt;nil}
-Analysis name is test_model
-  Adding measure item 'adjust_thermostat_setpoints_by_degrees'
+Creating JSON and ZIP file for test_model:0_1_12_discrete_dynamic_columns
+  Adding measure /Users/nlong/working/OpenStudio-analysis-gem/spec/files/measures/example_measure_auto_directory_name to zip file
   </system-out>
   <system-err>
   </system-err>

data/spec/reports/SPEC-OpenStudio-Analysis-Translator-Excel-discrete-with-dynamic-columns.xml

@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="OpenStudio::Analysis::Translator::Excel discrete with dynamic columns" tests="2" time="0.395226" failures="0" errors="0" skipped="0" timestamp="2014-06-10T14:29:49-06:00">
-  <testcase name="OpenStudio::Analysis::Translator::Excel discrete with dynamic columns should have parsed the spreadsheet" time="0.000311">
+<testsuite name="OpenStudio::Analysis::Translator::Excel discrete with dynamic columns" tests="2" time="0.376835" failures="0" errors="0" skipped="0" timestamp="2014-08-11T13:56:22-06:00">
+  <testcase name="OpenStudio::Analysis::Translator::Excel discrete with dynamic columns should have parsed the spreadsheet" time="0.000219">
   </testcase>
-  <testcase name="OpenStudio::Analysis::Translator::Excel discrete with dynamic columns should save the file" time="0.029375">
+  <testcase name="OpenStudio::Analysis::Translator::Excel discrete with dynamic columns should save the file" time="0.021798">
   </testcase>
   <system-out>
-{"variable_type"=&gt;"argument", "display_name"=&gt;"Baseline", "machine_name"=&gt;"baseline", "name"=&gt;"Baseline", "index"=&gt;1, "type"=&gt;nil, "units"=&gt;nil, "distribution"=&gt;{"min"=&gt;nil, "max"=&gt;nil, "mean"=&gt;nil, "stddev"=&gt;nil, "discrete_values"=&gt;nil, "discrete_weights"=&gt;nil, "type"=&gt;nil, "static_value"=&gt;nil, "source"=&gt;nil}, "notes"=&gt;nil, "relation_to_eui"=&gt;nil}
-{"variable_type"=&gt;"variable", "display_name"=&gt;"Degrees Fahrenheit to Adjust Cooling Setpoint By.", "machine_name"=&gt;"degrees_fahrenheit_to_adjust_cooling_setpoint_by.", "name"=&gt;"cooling_adjustment", "index"=&gt;1, "type"=&gt;"double", "units"=&gt;nil, "distribution"=&gt;{"min"=&gt;0.0, "max"=&gt;5.0, "mean"=&gt;5.0, "stddev"=&gt;nil, "discrete_values"=&gt;"[-2,0,2]", "discrete_weights"=&gt;"[0.33,0.33,0.33]", "type"=&gt;"discrete_uncertain", "static_value"=&gt;0.0, "source"=&gt;nil}, "notes"=&gt;nil, "relation_to_eui"=&gt;nil}
-{"variable_type"=&gt;"variable", "display_name"=&gt;"Degrees Fahrenheit to Adjust heating Setpoint By.", "machine_name"=&gt;"degrees_fahrenheit_to_adjust_heating_setpoint_by.", "name"=&gt;"heating_adjustment", "index"=&gt;2, "type"=&gt;"double", "units"=&gt;nil, "distribution"=&gt;{"min"=&gt;0.0, "max"=&gt;5.0, "mean"=&gt;4.0, "stddev"=&gt;nil, "discrete_values"=&gt;"[-2,0,2]", "discrete_weights"=&gt;"[0.33,0.33,0.33]", "type"=&gt;"discrete_uncertain", "static_value"=&gt;0.0, "source"=&gt;nil}, "notes"=&gt;nil, "relation_to_eui"=&gt;nil}
-{"variable_type"=&gt;"argument", "display_name"=&gt;"Alter Design Day Thermostats?", "machine_name"=&gt;"alter_design_day_thermostats?", "name"=&gt;"alter_design_days", "index"=&gt;3, "type"=&gt;"bool", "units"=&gt;nil, "distribution"=&gt;{"enumerations"=&gt;["true", "false"], "min"=&gt;nil, "max"=&gt;nil, "mean"=&gt;nil, "stddev"=&gt;nil, "discrete_values"=&gt;nil, "discrete_weights"=&gt;nil, "type"=&gt;nil, "static_value"=&gt;"FALSE", "source"=&gt;nil}, "notes"=&gt;nil, "relation_to_eui"=&gt;nil}
-Analysis name is test_model
-  Adding measure item 'adjust_thermostat_setpoints_by_degrees'
+Creating JSON and ZIP file for test_model:0_1_12_discrete_dynamic_columns
+  Adding measure /Users/nlong/working/OpenStudio-analysis-gem/spec/files/measures/example_measure_auto_directory_name to zip file
   </system-out>
   <system-err>
   </system-err>