openstudio-analysis 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64b711bc6dd71fed0572358ab94477f37adc4fd4
-  data.tar.gz: 406a7c55aa84200df93e4cb28760baf6e4223b27
+  metadata.gz: 74c0043c7f139238a9d7794eba641042e2fcf941
+  data.tar.gz: 3f6c3788437d50dce80865981d5d97a5717c6204
 SHA512:
-  metadata.gz: 38020c7b813e88564ff15b2e4eb3e8a721aa129ed602b193f0f0debd3a073f794ea3100c86cd5c8890e31f68b3c1f3ca69423d2b5d9cf952b678b40f407056e1
-  data.tar.gz: e1cbce6ac68b8b275f368560c27d39a2c76058ae65a399799723d26796172e7d26aa13fb5389c27db890a8d283a7c6b1c9c1a3c6e326e20459f74f2e0f4f317a
+  metadata.gz: ee7e7dd7efbe7c142e128a5f1409775f6a74b5e9bbff3476c8536cfe51300c7292e9c64a9c2f4517cf7d7429f8cf42b5ff49783fac706dec4f8f4481dd9b2db1
+  data.tar.gz: ea72ccaf13c8fabba36290b2c8451fbae3a30245650bcde78f8237b25e3f72d56c0ca62ecee09ecadd420a173f9b9f327e904a3cebd058727f4417bb90a8e2ef

data/lib/openstudio/analysis/server_api.rb

@@ -109,8 +109,8 @@ module OpenStudio
         analysis_ids
       end
 
-      def download_dataframe(analysis_id, save_directory=".")
-        response = @conn.get "/analyses/#{analysis_id}/download_data.rdata"
+      def download_dataframe(analysis_id, format='rdata', save_directory=".")
+        response = @conn.get "/analyses/#{analysis_id}/download_data.#{format}"
         if response.status == 200
           filename = response['content-disposition'].match(/filename=(\"?)(.+)\1/)[2]
           puts "File #{filename} already exists, overwriting" if File.exist?("#{save_directory}/#{filename}")
@@ -118,8 +118,17 @@ module OpenStudio
         end
       end
 
-      def download_variables(analysis_id, save_directory=".")
-        response = @conn.get "/analyses/#{analysis_id}/download_variables.rdata"
+      def download_variables(analysis_id, format='rdata', save_directory=".")
+        response = @conn.get "/analyses/#{analysis_id}/variables/download_variables.#{format}"
+        if response.status == 200
+          filename = response['content-disposition'].match(/filename=(\"?)(.+)\1/)[2]
+          puts "File #{filename} already exists, overwriting" if File.exist?("#{save_directory}/#{filename}")
+          File.open("#{save_directory}/#{filename}",'w') {|f| f << response.body}
+        end
+      end
+
+      def download_all_data_points(analysis_id, save_directory=".")
+        response = @conn.get "/analyses/#{analysis_id}/download_all_data_points"
         if response.status == 200
           filename = response['content-disposition'].match(/filename=(\"?)(.+)\1/)[2]
           puts "File #{filename} already exists, overwriting" if File.exist?("#{save_directory}/#{filename}")

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

@@ -421,7 +421,10 @@ module OpenStudio
           if File.extname(@weather_files.first) =~ /.zip/i
             new_analysis_json['analysis']['weather_file']['path'] = "./weather/#{File.basename(@weather_files.first, '.zip')}.epw"
           else
-            new_analysis_json['analysis']['weather_file']['path'] = "./weather/#{File.basename(@weather_files.first)}"
+            # get the first EPW file (not the first file)
+            weather = @weather_files.find{|w| File.extname(w).downcase == '.epw'}
+            fail "Could not find a weather file (*.epw) in weather directory #{File.dirname(@weather_files.first)}" unless weather
+            new_analysis_json['analysis']['weather_file']['path'] = "./weather/#{File.basename(weather)}"
           end
 
           json_file_name = "#{@export_path}/#{model[:name]}.json"

data/lib/openstudio/analysis/version.rb

@@ -1,5 +1,5 @@
 module OpenStudio
   module Analysis
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
   end
 end