openstudio-analysis 0.4.5 → 1.0.0.pat1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a460438de48ec2ba07da54a58e5c2b4df31495b0
-  data.tar.gz: 710522dfd0cb39a17a6f41dff61a11caf250776e
+  metadata.gz: 5a00a07cb4a46381c5195104bd6313d60e5beb88
+  data.tar.gz: 5c1123d9cd96dbec5d40559d939ab63507c03a60
 SHA512:
-  metadata.gz: 97237d9a0fdb49cc9b6e5cb400eaf7dd51b503de37bb457689b38ccbe7e2f977ac9cd8ed969bc8df5ce059bc2ba156ceb3f98b9846ead7002881ba5ab20e0959
-  data.tar.gz: f7a7cc8e3191c816cc41ed3b1fdfd3f8739eef45d4828c6f43b0ba62ea097214da807024bf249b77e48e4825e39b349b7467e1b6855551212d7186f2ab401e6d
+  metadata.gz: d9176d9833797ca194c4c0331db1b126e285ddf502f4048b989b00aab4b136d3547f874a66e6017439ac0dbe9065043a4518ab7fd632f571026d82b5a235ce68
+  data.tar.gz: e0c9f0ec99960484cddb742b7e40131dd035bf9115c013ddeda7928dd9eea6c44d060bc5e07f8830e5fc6d9cdaaba507a6df7beda5a2823d2c2f6d15c4296280

data/.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 rvm:
   - 2.0.0-p451
-  - 2.1
+  - 2.0.0-p648

data/CHANGELOG.md

@@ -1,12 +1,16 @@
 OpenStudio Analysis Gem Change Log
 ==================================
 
-Version Unreleased 
-------------------
+Version Unreleased (Version 0.5)
+--------------------------------
+* Remove allow_multiple_jobs and server_as_worker options. These are by defaulted to true now.
+* Remove uncertain strings from end of uncertainty distributions
+* Remove measures eval path for CSV import
 * Add diag analysis type to server_api run method
-* Remove support for Rubies < 2.0.
+* Remove support for Rubies < 2.0 and > 2.0.
 * Add json extension to formulation name upon save if none exists
 * Add zip extension to formulation zip upon save if none exists
+* In upload_datapoint, allows set the analysis_id in the file to the one passed.
 
 Version 0.4.4
 ------------------

data/Gemfile

@@ -3,6 +3,7 @@ source 'http://rubygems.org'
 gemspec
 
 gem 'openstudio-aws', github: 'NREL/OpenStudio-aws-gem', branch: 'develop'
+gem 'dencity'
 gem 'colored', '~> 1.2'
 
 group :test do

data/README.md

@@ -18,51 +18,59 @@ There are two ways to create an OpenStudio Analysis description:
 
 * Programmatically
 
-```
-analysis = OpenStudio::Analysis.create('Analysis Name')
-analysis.seed_model = 'local/dir/seed.osm'
-analysis.weather_file = 'local/dir/USA_CO_Golden-NREL.724666_TMY3.epw'
-
-# override existing workflow from a file by
-analysis.workflow = OpenStudio::Analysis::Workflow.load_from_file(...)
-
-# add measures to the workflow
-wf = analysis.workflow
-def add_measure_from_path(instance_name, instance_display_name, local_path_to_measure)
-wf.add_measure_from_path('instance_name', 'Display name', 'path_to_measure')
-wf.add_measure_from_path('instance_name_2', 'Display name two', 'path_to_measure_2')
-
-# make a measure's argument a variable
-m = wf.add_measure_from_path('instance_name_3', 'Display name three', 'path_to_measure_3')
-m.make_variable('variable_argument_name', 'discrete')
-
-m = wf.add_measure_from_path('instance_name_4', 'Display name four', 'path_to_measure_4')
-m.make_variable('variable_argument_name', 'pivot')
-m.argument_value('variable_argument_name', value)
-
-# Save off the analysis files and a static data point
-run_dir = 'local/run'
-analysis.save("#{run_dir}/analysis.json")
-analysis.save_zip("#{run_dir}/analysis.zip")
-analysis.save_static_data_point("#{run_dir}/data_point.zip")
-```
-
-If you would like to run the data point, then you can use the OpenStudio-workflow gem.
-
-```
-require 'openstudio-workflow'
-
-run_dir = 'local/run'
-OpenStudio::Workflow.extract_archive("#{run_dir}/analysis.zip", run_dir)
-
-options = {
-    problem_filename: 'analysis.json',
-    datapoint_filename: 'data_point.json',
-    analysis_root_path: run_dir
-}
-k = OpenStudio::Workflow.load 'Local', run_dir, options
-k.run
-```
+    ```
+    analysis = OpenStudio::Analysis.create('Analysis Name')
+    analysis.seed_model = 'local/dir/seed.osm'
+    analysis.weather_file = 'local/dir/USA_CO_Golden-NREL.724666_TMY3.epw'
+    
+    # override existing workflow from a file by
+    analysis.workflow = OpenStudio::Analysis::Workflow.load_from_file(...)
+    
+    # add measures to the workflow
+    wf = analysis.workflow
+    def add_measure_from_path(instance_name, instance_display_name, local_path_to_measure)
+    wf.add_measure_from_path('instance_name', 'Display name', 'path_to_measure')
+    wf.add_measure_from_path('instance_name_2', 'Display name two', 'path_to_measure_2')
+    
+    # make a measure's argument a variable
+    m = wf.add_measure_from_path('instance_name_3', 'Display name three', 'path_to_measure_3')
+    m.make_variable('variable_argument_name', 'discrete')
+    
+    m = wf.add_measure_from_path('instance_name_4', 'Display name four', 'path_to_measure_4')
+    m.make_variable('variable_argument_name', 'pivot')
+    m.argument_value('variable_argument_name', value)
+    
+    # Save off the analysis files and a static data point
+    run_dir = 'local/run'
+    analysis.save("#{run_dir}/analysis.json")
+    analysis.save_zip("#{run_dir}/analysis.zip")
+    analysis.save_static_data_point("#{run_dir}/data_point.zip")
+    ```
+
+* Running Data Points with Workflow Gem
+
+    ```
+    require 'openstudio-workflow'
+    
+    run_dir = 'local/run'
+    OpenStudio::Workflow.extract_archive("#{run_dir}/analysis.zip", run_dir)
+    
+    options = {
+        problem_filename: 'analysis.json',
+        datapoint_filename: 'data_point.json',
+        analysis_root_path: run_dir
+    }
+    k = OpenStudio::Workflow.load 'Local', run_dir, options
+    k.run
+    ```
+    
+* Server API
+
+    ```
+    
+    
+    ```
+
 
 ## Testing
 
@@ -72,7 +80,6 @@ This gem used RSpec for testing.  To test simply run `rspec` at the command line
 
 In the programmatic interface there are still several items that would be nice to have.
 
-* verify that the measure.xml file exists
 * Check the type of measure being added and make sure that it is in the right workflow (e.g. no energyplus measures before rubymeasures)
 * add reverse translator from existing analysis.jsons
 * more explicit run workflows. For example, add workflow steps for running energyplus, openstudio translator, radiance, etc
@@ -85,5 +92,4 @@ In the programmatic interface there are still several items that would be nice t
 
 * adding mulitple seed models
 * adding multiple weather files
-* 
 

data/lib/openstudio/analysis/formulation.rb

@@ -61,7 +61,7 @@ module OpenStudio
         @workflow ||= OpenStudio::Analysis::Workflow.new
       end
 
-      # Define the type of analysis that this is going to be running
+      # Define the type of analysis which is going to be running
       #
       # @param name [String] Name of the algorithm/analysis. (e.g. rgenoud, lhs, single_run)
       attr_writer :analysis_type