openstudio-analysis 0.3.7 → 0.4.0

data/spec/openstudio/excel_spec.rb

@@ -104,7 +104,6 @@ describe OpenStudio::Analysis::Translator::Excel do
       expect(File).to exist('spec/files/export/analysis/small_seed.zip')
 
       expect(JSON.parse(File.read('spec/files/export/analysis/small_seed.json'))).not_to be_nil
-
     end
   end
 
@@ -129,7 +128,6 @@ describe OpenStudio::Analysis::Translator::Excel do
       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
@@ -181,8 +179,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 %w(true false)
-            expect(eval(var['distribution']['discrete_weights'])).to match_array [0.8, 0.2]
+            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
@@ -257,7 +255,6 @@ describe OpenStudio::Analysis::Translator::Excel do
       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
@@ -372,7 +369,7 @@ describe OpenStudio::Analysis::Translator::Excel do
       expect(h['analysis']['output_variables']).to be_an Array
       h['analysis']['output_variables'].each do |o|
         if o['name'] == 'standard_report_legacy.total_energy'
-          expect(o['variable_type']).to eq 'Double'
+          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
@@ -380,7 +377,7 @@ describe OpenStudio::Analysis::Translator::Excel do
           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['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
@@ -530,19 +527,22 @@ describe OpenStudio::Analysis::Translator::Excel do
 
       expect(@excel.worker_finals.size).to eq 1
       expect(@excel.worker_inits[0][:ordered_file_name]).to eq '00_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_3_7_unique_measure_names.xlsx')
+      @excel = OpenStudio::Analysis::Translator::Excel.new('spec/files/0_4_0_lhs_discrete_continuous.xlsx')
     end
 
     it 'should fail to process' do
-      expect { @excel.process }.to raise_error("Measure Display Names are not unique for 'Rotate Building Relative to Current Orientation', 'Nothing Important'")
-    end
+      @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 full spreadsheet example' do
+  end
 end

data/spec/openstudio/formulation_spec.rb

@@ -0,0 +1,107 @@
+require 'spec_helper'
+
+describe OpenStudio::Analysis::Formulation do
+  it 'should create an analysis' do
+    a = OpenStudio::Analysis.create('Name of an analysis')
+    expect(a).not_to be nil
+    expect(a.display_name).to eq 'Name of an analysis'
+    expect(a).to be_a OpenStudio::Analysis::Formulation
+  end
+
+  it 'should have a workflow object' do
+    a = OpenStudio::Analysis.create('workflow')
+    expect(a.workflow).not_to be nil
+  end
+
+  it 'should load the workflow from a file' do
+    a = OpenStudio::Analysis.create('workflow')
+    file = File.join('spec/files/analysis/examples/medium_office_example.json')
+    expect(a.workflow = OpenStudio::Analysis::Workflow.from_file(file)).not_to be nil
+  end
+
+  it 'should save a hash (version 1)' do
+    a = OpenStudio::Analysis.create('workflow 2')
+    file = File.join('spec/files/analysis/examples/medium_office_example.json')
+    expect(a.workflow = OpenStudio::Analysis::Workflow.from_file(file)).not_to be nil
+    h = a.to_hash
+    # expect(h[:workflow].empty?).not_to eq true
+  end
+
+  it 'should create a save an empty analysis' do
+    a = OpenStudio::Analysis.create('workflow')
+    run_dir = 'spec/files/export/workflow'
+
+    FileUtils.mkdir_p run_dir
+
+    h = a.to_hash
+    expect(h[:analysis][:problem][:analysis_type]).to eq nil
+    expect(a.save "#{run_dir}/analysis.json").to eq true
+  end
+
+  it 'should increment objective functions' do
+    a = OpenStudio::Analysis.create('my analysis')
+
+    a.add_output(
+                     display_name: 'Total Natural Gas',
+                     name: 'standard_report_legacy.total_natural_gas',
+                     units: 'MJ/m2',
+                     objective_function: true
+                 )
+
+    expect(a.to_hash[:analysis][:output_variables].first[:objective_function_index]).to eq 0
+
+    a.add_output(
+                     display_name: 'Another Output',
+                     name: 'standard_report_legacy.output_2',
+                     units: 'MJ/m2',
+                     objective_function: true
+                 )
+    expect(a.to_hash[:analysis][:output_variables].last[:objective_function_index]).to eq 1
+  end
+
+  it 'should create a new formulation' do
+    a = OpenStudio::Analysis.create('my analysis')
+    p = 'spec/files/measures/SetThermostatSchedules'
+
+    a.workflow.add_measure_from_path('thermostat', 'thermostat', p)
+    m = a.workflow.add_measure_from_path('thermostat_2', 'thermostat 2', p)
+
+    d = {
+      type: 'uniform',
+      minimum: 5,
+      maximum: 7,
+      mean: 6.2
+    }
+    m.make_variable('cooling_sch', 'Change the cooling schedule', d)
+    m.argument_value('heating_sch', 'some-string')
+
+    expect(a.workflow.measures.size).to eq 2
+    expect(a.workflow.measures[1].arguments[2][:value]).to eq 'some-string'
+    expect(a.workflow.measures[1].variables[0][:uuid]).to match /[\w]{8}(-[\w]{4}){3}-[\w]{12}/
+
+    a.analysis_type = 'single_run'
+    a.algorithm.set_attribute('sample_method', 'all_variables')
+    o = {
+      display_name: 'Total Natural Gas',
+      display_name_short: 'Total Natural Gas',
+      metadata_id: nil,
+      name: 'total_natural_gas',
+      units: 'MJ/m2',
+      objective_function: true,
+      objective_function_index: 0,
+      objective_function_target: 330.7,
+      scaling_factor: nil,
+      objective_function_group: nil
+    }
+    a.add_output(o)
+
+    a.seed_model('spec/files/small_seed.osm')
+    a.weather_file('spec/files/partial_weather.epw')
+
+    expect(a.to_hash[:analysis][:problem][:algorithm][:objective_functions]).to match ['total_natural_gas']
+    expect(a.analysis_type).to eq 'single_run'
+
+    dp_hash = a.to_static_data_point_hash
+    expect(dp_hash[:data_point][:set_variable_values].values).to eq ['*No Change*']
+  end
+end

data/spec/openstudio/workflow_spec.rb

@@ -0,0 +1,90 @@
+require 'spec_helper'
+
+describe OpenStudio::Analysis::Workflow do
+  before :all do
+    @w = OpenStudio::Analysis::Workflow.new
+  end
+
+  it 'should create a workflow' do
+    expect(@w).not_to be nil
+    expect(@w).to be_a OpenStudio::Analysis::Workflow
+  end
+
+  it 'should add a measure' do
+    p = 'spec/files/measures/IncreaseInsulationRValueForRoofs'
+    expect(@w.add_measure_from_path('insulation', 'Increase Insulation', p)).to be_an OpenStudio::Analysis::WorkflowStep
+
+    p = 'spec/files/measures/ActualMeasureNoJson'
+    FileUtils.remove "#{p}/measure.json" if File.exist? "#{p}/measure.json"
+    m = @w.add_measure_from_path('a_measure', 'Actual Measure', p)
+    expect(m).to be_a OpenStudio::Analysis::WorkflowStep
+    expect(m.measure_definition_class_name).to eq 'RotateBuilding'
+  end
+
+  it 'should fix the path of the measure' do
+    p = 'spec/files/measures/IncreaseInsulationRValueForRoofs/measure.rb'
+    m = @w.add_measure_from_path('insulation', 'Increase Insulation', p)
+    expect(m).to be_an OpenStudio::Analysis::WorkflowStep
+    expect(m.measure_definition_directory).to eq 'spec/files/measures/IncreaseInsulationRValueForRoofs'
+  end
+
+  it 'should clear out a workflow' do
+    p = 'spec/files/measures/SetThermostatSchedules'
+    @w.add_measure_from_path('thermostat', 'thermostat', p)
+    @w.add_measure_from_path('thermostat 2', 'thermostat 2', p)
+
+    expect(@w.items.size).to be > 1
+    @w.clear
+    expect(@w.items.size).to eq 0
+
+    @w.add_measure_from_path('thermostat', 'thermostat', p)
+    @w.add_measure_from_path('thermostat 2', 'thermostat 2', p)
+    expect(@w.items.size).to eq 2
+  end
+
+  it 'should find a workflow step' do
+    @w.clear
+
+    p = 'spec/files/measures/SetThermostatSchedules'
+    @w.add_measure_from_path('thermostat', 'thermostat', p)
+    @w.add_measure_from_path('thermostat_2', 'thermostat 2', p)
+
+    m = @w.find_measure('thermostat_2')
+    expect(m).not_to be nil
+    expect(m).to be_a OpenStudio::Analysis::WorkflowStep
+    expect(m.name).to eq 'thermostat_2'
+  end
+
+  it 'should find a workflow step and make a variable' do
+    @w.clear
+
+    p = 'spec/files/measures/SetThermostatSchedules'
+    @w.add_measure_from_path('thermostat', 'thermostat', p)
+    @w.add_measure_from_path('thermostat_2', 'thermostat 2', p)
+
+    m = @w.find_measure('thermostat_2')
+    expect(m.argument_names).to eq %w(zones cooling_sch heating_sch material_cost)
+
+    d = {
+      type: 'uniform',
+      minimum: 5,
+      maximum: 7,
+      mean: 6.2
+    }
+    m.make_variable('cooling_sch', 'Change the cooling schedule', d)
+
+    d = {
+      type: 'uniform',
+      minimum: 5,
+      maximum: 7,
+      mean: 6.2
+    }
+    m.make_variable('heating_sch', 'Change the heating schedule', d)
+
+    expect(@w.measures.size).to eq 2
+    expect(@w.items.size).to eq 2
+    expect(@w.items.size).to eq 2
+
+    expect(@w.all_variables.size).to eq 2
+  end
+end

data/spec/openstudio/workflow_step_spec.rb

@@ -0,0 +1,116 @@
+require 'spec_helper'
+
+describe OpenStudio::Analysis::WorkflowStep do
+  it 'should create a workflow' do
+    s = OpenStudio::Analysis::WorkflowStep.new
+    expect(s).not_to be nil
+    expect(s).to be_a OpenStudio::Analysis::WorkflowStep
+  end
+
+  it 'should add a measure' do
+    h = 'spec/files/measures/IncreaseInsulationRValueForRoofs/measure.json'
+    s = OpenStudio::Analysis::WorkflowStep.from_measure_hash(
+        'my_instance',
+        'my instance display name',
+        h,
+        JSON.parse(File.read(h), symbolize_names: true))
+    puts s
+  end
+
+  it 'should tag a discrete variable' do
+    h = 'spec/files/measures/SetThermostatSchedules/measure.json'
+    measure = OpenStudio::Analysis::WorkflowStep.from_measure_hash(
+        'my_instance',
+        'my instance display name',
+        h,
+        JSON.parse(File.read(h), symbolize_names: true))
+
+    expect(measure.name).to eq 'my_instance'
+    v = {
+      type: 'discrete',
+      minimum: 'low string',
+      maximum: 'high string',
+      mean: 'middle string',
+      values: %w(a b c d),
+      weights: [0.25, 0.25, 0.25, 0.25]
+    }
+    r = measure.make_variable('cooling_sch', 'my variable', v)
+    expect(r).to eq true
+  end
+
+  it 'should tag a continuous variable' do
+    h = 'spec/files/measures/SetThermostatSchedules/measure.json'
+    measure = OpenStudio::Analysis::WorkflowStep.from_measure_hash(
+        'my_instance',
+        'my instance display name',
+        h,
+        JSON.parse(File.read(h), symbolize_names: true))
+
+    expect(measure.name).to eq 'my_instance'
+    v = {
+      type: 'triangle',
+      minimum: 0.5,
+      maximum: 20,
+      mean: 10,
+      static_value: 24601
+    }
+    r = measure.make_variable('cooling_sch', 'my variable', v)
+
+    h = measure.to_hash
+
+    expect(h[:variables].first[:static_value]).to eq 24601
+    expect(h[:variables].first.key?(:step_size)).to eq false
+
+    expect(r).to eq true
+  end
+
+  it 'should tag a normal continuous variable' do
+    h = 'spec/files/measures/SetThermostatSchedules/measure.json'
+    measure = OpenStudio::Analysis::WorkflowStep.from_measure_hash(
+        'my_instance',
+        'my instance display name',
+        h,
+        JSON.parse(File.read(h), symbolize_names: true))
+
+    expect(measure.name).to eq 'my_instance'
+    v = {
+      type: 'normal',
+      minimum: 0.5,
+      maximum: 20,
+      mean: 10,
+      standard_deviation: 2
+    }
+    r = measure.make_variable('cooling_sch', 'my variable', v)
+
+    h = measure.to_hash
+
+    expect(h[:variables].first.key?(:step_size)).to eq false
+
+    expect(r).to eq true
+  end
+
+  it 'should tag a uniform variable' do
+    h = 'spec/files/measures/SetThermostatSchedules/measure.json'
+    measure = OpenStudio::Analysis::WorkflowStep.from_measure_hash(
+        'my_instance',
+        'my instance display name',
+        h,
+        JSON.parse(File.read(h), symbolize_names: true))
+
+    expect(measure.name).to eq 'my_instance'
+    v = {
+      type: 'uniform',
+      minimum: 0.5,
+      maximum: 20,
+      mean: 10
+    }
+    r = measure.make_variable('cooling_sch', 'my variable', v)
+
+    h = measure.to_hash
+
+    # puts JSON.pretty_generate(h)
+    expect(h[:variables].first.key?(:step_size)).to eq false
+
+    expect(r).to eq true
+  end
+end

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

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudio::Analysis::Formulation" tests="7" time="0.03787" failures="0" errors="0" skipped="0" timestamp="2015-01-06T07:36:50-07:00">
+  <testcase name="OpenStudio::Analysis::Formulation should create an analysis" time="0.001045">
+  </testcase>
+  <testcase name="OpenStudio::Analysis::Formulation should have a workflow object" time="8.2e-05">
+  </testcase>
+  <testcase name="OpenStudio::Analysis::Formulation should load the workflow from a file" time="0.001">
+  </testcase>
+  <testcase name="OpenStudio::Analysis::Formulation should save a hash (version 1)" time="0.030748">
+  </testcase>
+  <testcase name="OpenStudio::Analysis::Formulation should create a save an empty analysis" time="0.000744">
+  </testcase>
+  <testcase name="OpenStudio::Analysis::Formulation should increment objective functions" time="0.000127">
+  </testcase>
+  <testcase name="OpenStudio::Analysis::Formulation should create a new formulation" time="0.003436">
+  </testcase>
+  <system-out>
+Parsing file version 1
+Parsing file version 1
+loading config settings from /Users/nlong/.bcl/config.yml
+loading config settings from /Users/nlong/.bcl/config.yml
+  </system-out>
+  <system-err>
+Deprecation Warning. In Version 0.5 the _uncertain text will be removed from distribution types: uniform_uncertain
+Deprecation Warning. RubyContinuousVariable (OpenStudio called this the variable_type) is no longer persisted
+Deprecation Warning. workflow_step_type is no longer persisted
+  </system-err>
+</testsuite>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="OpenStudio::Analysis::ServerApi create a new object instance" tests="1" time="0.013695" failures="0" errors="0" skipped="0" timestamp="2014-11-08T02:22:15-07:00">
-  <testcase name="OpenStudio::Analysis::ServerApi create a new object instance should set the default host to localhost" time="0.000172">
+<testsuite name="OpenStudio::Analysis::ServerApi create a new object instance" tests="1" time="0.005303" failures="0" errors="0" skipped="0" timestamp="2015-01-06T07:36:50-07:00">
+  <testcase name="OpenStudio::Analysis::ServerApi create a new object instance should set the default host to localhost" time="0.000162">
   </testcase>
 </testsuite>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="OpenStudio::Analysis::ServerApi test not localhost" tests="1" time="0.00058" failures="0" errors="0" skipped="0" timestamp="2014-11-08T02:22:15-07:00">
-  <testcase name="OpenStudio::Analysis::ServerApi test not localhost should have a not localhost URL" time="0.000393">
+<testsuite name="OpenStudio::Analysis::ServerApi test not localhost" tests="1" time="0.000568" failures="0" errors="0" skipped="0" timestamp="2015-01-06T07:36:50-07:00">
+  <testcase name="OpenStudio::Analysis::ServerApi test not localhost should have a not localhost URL" time="0.000378">
   </testcase>
 </testsuite>

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

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="OpenStudio::Analysis::ServerApi" tests="0" time="9.3e-05" skipped="0" timestamp="2014-11-08T02:22:15-07:00">
+<testsuite name="OpenStudio::Analysis::ServerApi" tests="0" time="0.000117" skipped="0" timestamp="2015-01-06T07:36:50-07:00">
 </testsuite>

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

@@ -1,13 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="OpenStudio::Analysis::Translator::Excel discrete variables" tests="2" time="0.449326" failures="0" errors="0" skipped="0" timestamp="2014-11-08T02:22:06-07:00">
-  <testcase name="OpenStudio::Analysis::Translator::Excel discrete variables should have parsed the spreadsheet" time="0.00139">
+<testsuite name="OpenStudio::Analysis::Translator::Excel discrete variables" tests="2" time="0.471354" failures="0" errors="0" skipped="0" timestamp="2015-01-06T07:36:41-07:00">
+  <testcase name="OpenStudio::Analysis::Translator::Excel discrete variables should have parsed the spreadsheet" time="0.003573">
   </testcase>
-  <testcase name="OpenStudio::Analysis::Translator::Excel discrete variables should save the file" time="0.016848">
+  <testcase name="OpenStudio::Analysis::Translator::Excel discrete variables should save the file" time="0.033966">
   </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}
+{"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, "delta_x"=&gt;nil, "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>
+Deprecation Warning. In Version 0.5 the _uncertain text will be removed from distribution types: discrete_uncertain
+Deprecation Warning. RubyContinuousVariable (OpenStudio called this the variable_type) is no longer persisted
+Deprecation Warning. workflow_step_type is no longer persisted
+Deprecation Warning. In Version 0.5 the _uncertain text will be removed from distribution types: uniform_uncertain
+Deprecation Warning. RubyContinuousVariable (OpenStudio called this the variable_type) is no longer persisted
+Deprecation Warning. workflow_step_type is no longer persisted
+Deprecation Warning. In Version 0.5 the _uncertain text will be removed from distribution types: uniform_uncertain
+Deprecation Warning. RubyContinuousVariable (OpenStudio called this the variable_type) is no longer persisted
+Deprecation Warning. workflow_step_type is no longer persisted
+Deprecation Warning. In Version 0.5 the _uncertain text will be removed from distribution types: uniform_uncertain
+Deprecation Warning. RubyContinuousVariable (OpenStudio called this the variable_type) is no longer persisted
+Deprecation Warning. workflow_step_type is no longer persisted
+Deprecation Warning. In Version 0.5 the _uncertain text will be removed from distribution types: discrete_uncertain
+Deprecation Warning. RubyContinuousVariable (OpenStudio called this the variable_type) is no longer persisted
+Deprecation Warning. workflow_step_type is no longer persisted
+Deprecation Warning. In Version 0.5 the _uncertain text will be removed from distribution types: triangle_uncertain
+Deprecation Warning. RubyContinuousVariable (OpenStudio called this the variable_type) is no longer persisted
+Deprecation Warning. workflow_step_type is no longer persisted
+Deprecation Warning. In Version 0.5 the _uncertain text will be removed from distribution types: triangle_uncertain
+Deprecation Warning. RubyContinuousVariable (OpenStudio called this the variable_type) is no longer persisted
+Deprecation Warning. workflow_step_type is no longer persisted
+Deprecation Warning. In Version 0.5 the _uncertain text will be removed from distribution types: discrete_uncertain
+Deprecation Warning. RubyContinuousVariable (OpenStudio called this the variable_type) is no longer persisted
+Deprecation Warning. workflow_step_type is no longer persisted
+  </system-err>
 </testsuite>

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

@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="OpenStudio::Analysis::Translator::Excel discrete with dynamic columns" tests="2" time="0.368755" failures="0" errors="0" skipped="0" timestamp="2014-11-08T02:22:07-07:00">
-  <testcase name="OpenStudio::Analysis::Translator::Excel discrete with dynamic columns should have parsed the spreadsheet" time="0.000148">
+<testsuite name="OpenStudio::Analysis::Translator::Excel discrete with dynamic columns" tests="2" time="0.393895" failures="0" errors="0" skipped="0" timestamp="2015-01-06T07:36:42-07:00">
+  <testcase name="OpenStudio::Analysis::Translator::Excel discrete with dynamic columns should have parsed the spreadsheet" time="0.000159">
   </testcase>
-  <testcase name="OpenStudio::Analysis::Translator::Excel discrete with dynamic columns should save the file" time="0.012181">
+  <testcase name="OpenStudio::Analysis::Translator::Excel discrete with dynamic columns should save the file" time="0.030632">
   </testcase>
   <system-out>
 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>
+Deprecation Warning. In Version 0.5 the _uncertain text will be removed from distribution types: discrete_uncertain
+Deprecation Warning. RubyContinuousVariable (OpenStudio called this the variable_type) is no longer persisted
+Deprecation Warning. workflow_step_type is no longer persisted
+Deprecation Warning. In Version 0.5 the _uncertain text will be removed from distribution types: discrete_uncertain
+Deprecation Warning. RubyContinuousVariable (OpenStudio called this the variable_type) is no longer persisted
+Deprecation Warning. workflow_step_type is no longer persisted
+  </system-err>
 </testsuite>

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

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="OpenStudio::Analysis::Translator::Excel no variables defined" tests="4" time="0.769701" failures="0" errors="0" skipped="0" timestamp="2014-11-08T02:22:03-07:00">
-  <testcase name="OpenStudio::Analysis::Translator::Excel no variables defined should have excel data" time="0.190981">
+<testsuite name="OpenStudio::Analysis::Translator::Excel no variables defined" tests="4" time="0.790654" failures="0" errors="0" skipped="0" timestamp="2015-01-06T07:36:37-07:00">
+  <testcase name="OpenStudio::Analysis::Translator::Excel no variables defined should have excel data" time="0.161278">
   </testcase>
-  <testcase name="OpenStudio::Analysis::Translator::Excel no variables defined should process the excel file" time="0.252256">
+  <testcase name="OpenStudio::Analysis::Translator::Excel no variables defined should process the excel file" time="0.275632">
   </testcase>
-  <testcase name="OpenStudio::Analysis::Translator::Excel no variables defined should not work because no variables defined" time="0.063078">
+  <testcase name="OpenStudio::Analysis::Translator::Excel no variables defined should not work because no variables defined" time="0.074529">
   </testcase>
-  <testcase name="OpenStudio::Analysis::Translator::Excel no variables defined should not export to a JSON" time="0.262673">
+  <testcase name="OpenStudio::Analysis::Translator::Excel no variables defined should not export to a JSON" time="0.278602">
   </testcase>
   <system-out>
-#&lt;OpenStudio::Analysis::Translator::Excel:0x007fcc0c30c7f0&gt;
+#&lt;OpenStudio::Analysis::Translator::Excel:0x007f955b1390a0&gt;
   </system-out>
 </testsuite>

data/spec/reports/SPEC-OpenStudio-Analysis-Translator-Excel-proxy-setup-with-user.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="OpenStudio::Analysis::Translator::Excel proxy setup with user" tests="1" time="0.376302" failures="0" errors="0" skipped="0" timestamp="2014-11-08T02:22:06-07:00">
-  <testcase name="OpenStudio::Analysis::Translator::Excel proxy setup with user should have a user" time="0.000248">
+<testsuite name="OpenStudio::Analysis::Translator::Excel proxy setup with user" tests="1" time="0.395469" failures="0" errors="0" skipped="0" timestamp="2015-01-06T07:36:41-07:00">
+  <testcase name="OpenStudio::Analysis::Translator::Excel proxy setup with user should have a user" time="0.000184">
   </testcase>
 </testsuite>

data/spec/reports/SPEC-OpenStudio-Analysis-Translator-Excel-proxy-setup.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="OpenStudio::Analysis::Translator::Excel proxy setup" tests="1" time="0.370704" failures="0" errors="0" skipped="0" timestamp="2014-11-08T02:22:05-07:00">
-  <testcase name="OpenStudio::Analysis::Translator::Excel proxy setup should have a proxy setting" time="0.000268">
+<testsuite name="OpenStudio::Analysis::Translator::Excel proxy setup" tests="1" time="0.412036" failures="0" errors="0" skipped="0" timestamp="2015-01-06T07:36:40-07:00">
+  <testcase name="OpenStudio::Analysis::Translator::Excel proxy setup should have a proxy setting" time="0.000206">
   </testcase>
 </testsuite>

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

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="OpenStudio::Analysis::Translator::Excel setup output variables" tests="7" time="0.419312" failures="0" errors="0" skipped="0" timestamp="2014-11-08T02:22:07-07:00">
-  <testcase name="OpenStudio::Analysis::Translator::Excel setup output variables should have a model" time="0.000186">
+<testsuite name="OpenStudio::Analysis::Translator::Excel setup output variables" tests="7" time="0.444562" failures="0" errors="0" skipped="0" timestamp="2015-01-06T07:36:42-07:00">
+  <testcase name="OpenStudio::Analysis::Translator::Excel setup output variables should have a model" time="0.000184">
   </testcase>
-  <testcase name="OpenStudio::Analysis::Translator::Excel setup output variables should have a weather file" time="7.1e-05">
+  <testcase name="OpenStudio::Analysis::Translator::Excel setup output variables should have a weather file" time="9.0e-05">
   </testcase>
-  <testcase name="OpenStudio::Analysis::Translator::Excel setup output variables should have notes and source" time="6.7e-05">
+  <testcase name="OpenStudio::Analysis::Translator::Excel setup output variables should have notes and source" time="8.1e-05">
   </testcase>
-  <testcase name="OpenStudio::Analysis::Translator::Excel setup output variables should have typed booleans" time="5.7e-05">
+  <testcase name="OpenStudio::Analysis::Translator::Excel setup output variables should have typed booleans" time="7.1e-05">
   </testcase>
-  <testcase name="OpenStudio::Analysis::Translator::Excel setup output variables should have algorithm setup" time="7.5e-05">
+  <testcase name="OpenStudio::Analysis::Translator::Excel setup output variables should have algorithm setup" time="7.9e-05">
   </testcase>
-  <testcase name="OpenStudio::Analysis::Translator::Excel setup output variables should create a valid hash" time="0.020303">
+  <testcase name="OpenStudio::Analysis::Translator::Excel setup output variables should create a valid hash" time="0.006886">
   </testcase>
-  <testcase name="OpenStudio::Analysis::Translator::Excel setup output variables should write a json" time="0.017488">
+  <testcase name="OpenStudio::Analysis::Translator::Excel setup output variables should write a json" time="0.034908">
   </testcase>
   <system-out>
 /Users/nlong/working/OpenStudio-analysis-gem/spec/files/partial_weather.epw
@@ -20,4 +20,48 @@ Creating JSON and ZIP file for Output Vars:0_1_09_outputvars
   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>
+Deprecation Warning. In Version 0.5 the _uncertain text will be removed from distribution types: triangle_uncertain
+Deprecation Warning. RubyContinuousVariable (OpenStudio called this the variable_type) is no longer persisted
+Deprecation Warning. workflow_step_type is no longer persisted
+Deprecation Warning. In Version 0.5 the _uncertain text will be removed from distribution types: uniform_uncertain
+Deprecation Warning. RubyContinuousVariable (OpenStudio called this the variable_type) is no longer persisted
+Deprecation Warning. workflow_step_type is no longer persisted
+Deprecation Warning. In Version 0.5 the _uncertain text will be removed from distribution types: uniform_uncertain
+Deprecation Warning. RubyContinuousVariable (OpenStudio called this the variable_type) is no longer persisted
+Deprecation Warning. workflow_step_type is no longer persisted
+Deprecation Warning. In Version 0.5 the _uncertain text will be removed from distribution types: uniform_uncertain
+Deprecation Warning. RubyContinuousVariable (OpenStudio called this the variable_type) is no longer persisted
+Deprecation Warning. workflow_step_type is no longer persisted
+Deprecation Warning. In Version 0.5 the _uncertain text will be removed from distribution types: triangle_uncertain
+Deprecation Warning. RubyContinuousVariable (OpenStudio called this the variable_type) is no longer persisted
+Deprecation Warning. workflow_step_type is no longer persisted
+Deprecation Warning. In Version 0.5 the _uncertain text will be removed from distribution types: triangle_uncertain
+Deprecation Warning. RubyContinuousVariable (OpenStudio called this the variable_type) is no longer persisted
+Deprecation Warning. workflow_step_type is no longer persisted
+Deprecation Warning. In Version 0.5 the _uncertain text will be removed from distribution types: triangle_uncertain
+Deprecation Warning. RubyContinuousVariable (OpenStudio called this the variable_type) is no longer persisted
+Deprecation Warning. workflow_step_type is no longer persisted
+Deprecation Warning. In Version 0.5 the _uncertain text will be removed from distribution types: triangle_uncertain
+Deprecation Warning. RubyContinuousVariable (OpenStudio called this the variable_type) is no longer persisted
+Deprecation Warning. workflow_step_type is no longer persisted
+Deprecation Warning. In Version 0.5 the _uncertain text will be removed from distribution types: uniform_uncertain
+Deprecation Warning. RubyContinuousVariable (OpenStudio called this the variable_type) is no longer persisted
+Deprecation Warning. workflow_step_type is no longer persisted
+Deprecation Warning. In Version 0.5 the _uncertain text will be removed from distribution types: uniform_uncertain
+Deprecation Warning. RubyContinuousVariable (OpenStudio called this the variable_type) is no longer persisted
+Deprecation Warning. workflow_step_type is no longer persisted
+Deprecation Warning. In Version 0.5 the _uncertain text will be removed from distribution types: uniform_uncertain
+Deprecation Warning. RubyContinuousVariable (OpenStudio called this the variable_type) is no longer persisted
+Deprecation Warning. workflow_step_type is no longer persisted
+Deprecation Warning. In Version 0.5 the _uncertain text will be removed from distribution types: triangle_uncertain
+Deprecation Warning. RubyContinuousVariable (OpenStudio called this the variable_type) is no longer persisted
+Deprecation Warning. workflow_step_type is no longer persisted
+Deprecation Warning. In Version 0.5 the _uncertain text will be removed from distribution types: triangle_uncertain
+Deprecation Warning. RubyContinuousVariable (OpenStudio called this the variable_type) is no longer persisted
+Deprecation Warning. workflow_step_type is no longer persisted
+Deprecation Warning. In Version 0.5 the _uncertain text will be removed from distribution types: triangle_uncertain
+Deprecation Warning. RubyContinuousVariable (OpenStudio called this the variable_type) is no longer persisted
+Deprecation Warning. workflow_step_type is no longer persisted
+  </system-err>
 </testsuite>