openstudio-analysis 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b214aa6493bf1187a2d2130e0a56696d556c56dd
-  data.tar.gz: 7d04f958a36a0b5865f03552c1cdce58042316d5
+  metadata.gz: 20d2c5efe5a2babc4dadf20a9cef02117c77d4d3
+  data.tar.gz: 5510ce7b02e54ea13dc08f6a10b020b1b4b48b0d
 SHA512:
-  metadata.gz: 063661d822e81a646777b9ddb2af3c09e8b2329541a1aa5963abaec781131da0f35a44ff54e20ff4ec2d7930584edb837ca179d12e36e3586e6d9953bf656e8d
-  data.tar.gz: 0914e8713a6e68e77c08daf7399bb3e7bb2a2c6666615aeb8d242eff6b60177e8fe34af81ecc14f81cab577b95ebfbbd66635c429ce61a5a9d6dad330cb2f5b4
+  metadata.gz: 296be88cb795fa532c9b3a095339d85e65829bd227e390027e9b5172ef4a90fbd65a2cac548f5487b1c3e5acaa64dbe8c6be45f793e6ec91ab04296aeba86d18
+  data.tar.gz: 9e25cbcd1e5c370050bff6a51b00cdf5bbf659f71243b523b0d4b6f4b05444cdb0c82b530d3ed7217da6045c81f87567698f61944d9ea55b53873d5c47bc3540

data/CHANGELOG.md

@@ -12,3 +12,8 @@ Version 0.1.1
 
 ### Resolved Issues
 
+* Added check for when weather file is a zip or an epw
+
+* Convert argument values to the right variable types
+
+* Add measure type parsing by reading the inherited class

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

@@ -87,7 +87,7 @@ module OpenStudio
         def get_binding
           binding
         end
-        
+
         # TODO: move this into a new class that helps construct this file
         def translate_to_analysis_json
           # Load in the templates for constructing the JSON file
@@ -125,12 +125,31 @@ module OpenStudio
                 if @variable['variable_type'] == 'argument'
                   ag = nil
                   if @variable['method'] == 'static'
+                    if !@variable['distribution']['static_value']
+                      raise "can not have an argument that is not a static value defined in which to set the argument"
+                    end
+
                     # add this as an argument
+                    case @variable['type']
+                      when "Double"
+                        @static_value = @variable['distribution']['static_value'].to_f
+                      when "Integer"
+                        @static_value = @variable['distribution']['static_value'].to_i
+                      when "String", "Choice"
+                        @static_value = @variable['distribution']['static_value'].inspect
+                      when "Bool"
+                        if @variable['distribution']['static_value'].downcase == "true"
+                          @static_value = true
+                        else
+                          @static_value = false
+                        end
+                      else
+                        raise "Unknown variable type of #{@variable['type']}"
+                    end
                     ag = JSON.parse(argument_template.result(get_binding))
-                  elsif raise "can not have an argument without having a static value defined in which to set the argument"
                   end
                   wf['arguments'] << ag
-                else
+                else # must be a vriable
                   vr = nil
                   if @variable['method'] == 'static'
                     # add this as an argument
@@ -195,8 +214,13 @@ module OpenStudio
 
           # Set the weather file as the first in the list -- this is optional
           # TODO: check if epw or if zip file
+
           analysis_json['analysis']['weather_file']['file_type'] = 'EPW'
-          analysis_json['analysis']['weather_file']['path'] = "./weather/#{File.basename(@weather_files.first, '.zip')}.epw"
+          if File.extname(@weather_files.first) =~ /.zip/i
+            analysis_json['analysis']['weather_file']['path'] = "./weather/#{File.basename(@weather_files.first, '.zip')}.epw"
+          else
+            analysis_json['analysis']['weather_file']['path'] = "./weather/#{File.basename(@weather_files.first)}"
+          end
 
           json_file_name = "#{@export_path}/#{model[:name]}.json"
           FileUtils.rm_f(json_file_name) if File.exists?(json_file_name)
@@ -348,6 +372,8 @@ module OpenStudio
               data['data'][measure_index]['enabled'] = row[0] == "TRUE" ? true : false
               data['data'][measure_index]['measure_file_name'] = row[2]
               data['data'][measure_index]['measure_file_name_directory'] = row[2].underscore
+              data['data'][measure_index]['measure_type'] = row[3]
+              
               data['data'][measure_index]['version'] = @version_id
 
               data['data'][measure_index]['variables'] = []

data/lib/openstudio/analysis/version.rb

@@ -1,6 +1,6 @@
 module OpenStudio
   module Analysis
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
     OPENSTUDIO_VERSION = "1.1.2"
   end
 end

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

@@ -2,7 +2,7 @@
     "display_name": "<%= @variable['display_name'] %>",
     "machine_name": "<%= @variable['machine_name'] %>",
     "name": "<%= @variable['name'] %>",
-    "value": "<%= @variable['distribution']['static_value'] %>",
+    "value": <%= @static_value %>,
     "uuid_DELETEME": "<%= UUID.new.generate %>",
     "uuid": "<%= UUID.new.generate %>",
     "version_uuid_DELETEME": "<%= UUID.new.generate %>",

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

@@ -8,7 +8,7 @@
     "measure_definition_uuid_CHANGE_TO_ME": "<%= UUID.new.generate %>",
     "bcl_measure_version_uuid": "<%= UUID.new.generate %>",
     "measure_definition_version_uuid_CHANGE_TO_ME": "<%= UUID.new.generate %>",
-    "measure_type": "XmlMeasure",
+    "measure_type": "<%= @measure['measure_type'] %>    ",
     "name": "<%= @measure['name'] %>",
     "display_name": "<%= @measure['display_name'] %>",
     "uuid": "<%= UUID.new.generate %>",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-analysis
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nicholas Long
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json