aemo 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 462daf9d1f745619116d0696f71d4e4ada7d5a9e
-  data.tar.gz: 87d0ae57035a4134252d0be9070b40f7c158f536
+  metadata.gz: 339e83560f9d3cbf2dde96d4097b1cdd905b7299
+  data.tar.gz: 276afbdd7bc7a07948a54195ee7efe7fd187b940
 SHA512:
-  metadata.gz: f5f3601a33f2b69105665b5caa8dcfbfa024c90f75db6d4564357a31f8bf90f5111d6c5b4167b720f0543e18ac61e3c4282377449d449c271707ae8e64a60902
-  data.tar.gz: 3364c54321a235b3bacf33feebf2992fe79dfc63a30582c211a8f3fef3df1ff68643e88fa188ee6b918752453f87841d59e5f7b0f454f7f2514c648c07ea74a4
+  metadata.gz: 710fcb76538f49718313d3b89d9930820dee43dfe70a5c8eebda6d67e41a232234ad43b0edcbdffe95c47fb2403872d9ec4e2ced6ea99c7a068ab4ea2adbb51e
+  data.tar.gz: 4fb67cf0b3611f6a7b4f82a1bdadf8824f1189d8ab490b6893675725640ed0ce2d442bb74b9449ce3b5839c318e8e5fd2dc789a3bb26024705f920081a8fdaeb

data/aemo.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'aemo'
-  s.version     = '0.1.8'
+  s.version     = '0.1.9'
   s.platform    = Gem::Platform::RUBY
   s.date        = '2015-02-26'
   s.summary     = 'AEMO Gem'

data/lib/aemo/nem12.rb

@@ -87,36 +87,36 @@ module AEMO
     }
     
     METHOD_FLAGS = {
-      "11" => { type: ["SUB"], installation_type: [1,2,3,4], short_descriptor: "Check", description: "" },
-      "12" => { type: ["SUB"], installation_type: [1,2,3,4], short_descriptor: "Calculated", description: "" },
-      "13" => { type: ["SUB"], installation_type: [1,2,3,4], short_descriptor: "SCADA", description: "" },
-      "14" => { type: ["SUB"], installation_type: [1,2,3,4], short_descriptor: "Like Day", description: "" },
-      "15" => { type: ["SUB"], installation_type: [1,2,3,4], short_descriptor: "Average Like Day", description: "" },
-      "16" => { type: ["SUB"], installation_type: [1,2,3,4], short_descriptor: "Agreed", description: "" },
-      "17" => { type: ["SUB"], installation_type: [1,2,3,4], short_descriptor: "Linear", description: "" },
-      "18" => { type: ["SUB"], installation_type: [1,2,3,4], short_descriptor: "Alternate", description: "" },
-      "19" => { type: ["SUB"], installation_type: [1,2,3,4], short_descriptor: "Zero", description: "" },
-      "51" => { type: ["EST","SUB"], installation_type: 5, short_descriptor: "Previous Year", description: "" },
-      "52" => { type: ["EST","SUB"], installation_type: 5, short_descriptor: "Previous Read", description: "" },
-      "53" => { type: ["SUB"], installation_type: 5, short_descriptor: "Revision", description: "" },
-      "54" => { type: ["SUB"], installation_type: 5, short_descriptor: "Linear", description: "" },
-      "55" => { type: ["SUB"], installation_type: 5, short_descriptor: "Agreed", description: "" },
-      "56" => { type: ["EST","SUB"], installation_type: 5, short_descriptor: "Prior to First Read – Agreed", description: "" },
-      "57" => { type: ["EST","SUB"], installation_type: 5, short_descriptor: "Customer Class", description: "" },
-      "58" => { type: ["EST","SUB"], installation_type: 5, short_descriptor: "Zero", description: "" },
-      "61" => { type: ["EST","SUB"], installation_type: 6, short_descriptor: "Previous Year", description: "" },
-      "62" => { type: ["EST","SUB"], installation_type: 6, short_descriptor: "Previous Read", description: "" },
-      "63" => { type: ["EST","SUB"], installation_type: 6, short_descriptor: "Customer Class", description: "" },
-      "64" => { type: ["SUB"], installation_type: 6, short_descriptor: "Agreed", description: "" },
-      "65" => { type: ["EST"], installation_type: 6, short_descriptor: "ADL", description: "" },
-      "66" => { type: ["SUB"], installation_type: 6, short_descriptor: "Revision", description: "" },
-      "67" => { type: ["SUB"], installation_type: 6, short_descriptor: "Customer Read", description: "" },
-      "68" => { type: ["EST","SUB"], installation_type: 6, short_descriptor: "Zero", description: "" },
-      "71" => { type: ["SUB"], installation_type: 7, short_descriptor: "Recalculation", description: "" },
-      "72" => { type: ["SUB"], installation_type: 7, short_descriptor: "Revised Table", description: "" },
-      "73" => { type: ["SUB"], installation_type: 7, short_descriptor: "Revised Algorithm", description: "" },
-      "74" => { type: ["SUB"], installation_type: 7, short_descriptor: "Agreed", description: "" },
-      "75" => { type: ["EST"], installation_type: 7, short_descriptor: "Existing Table", description: "" }
+      11 => { type: ["SUB"], installation_type: [1,2,3,4], short_descriptor: "Check", description: "" },
+      12 => { type: ["SUB"], installation_type: [1,2,3,4], short_descriptor: "Calculated", description: "" },
+      13 => { type: ["SUB"], installation_type: [1,2,3,4], short_descriptor: "SCADA", description: "" },
+      14 => { type: ["SUB"], installation_type: [1,2,3,4], short_descriptor: "Like Day", description: "" },
+      15 => { type: ["SUB"], installation_type: [1,2,3,4], short_descriptor: "Average Like Day", description: "" },
+      16 => { type: ["SUB"], installation_type: [1,2,3,4], short_descriptor: "Agreed", description: "" },
+      17 => { type: ["SUB"], installation_type: [1,2,3,4], short_descriptor: "Linear", description: "" },
+      18 => { type: ["SUB"], installation_type: [1,2,3,4], short_descriptor: "Alternate", description: "" },
+      19 => { type: ["SUB"], installation_type: [1,2,3,4], short_descriptor: "Zero", description: "" },
+      51 => { type: ["EST","SUB"], installation_type: 5, short_descriptor: "Previous Year", description: "" },
+      52 => { type: ["EST","SUB"], installation_type: 5, short_descriptor: "Previous Read", description: "" },
+      53 => { type: ["SUB"], installation_type: 5, short_descriptor: "Revision", description: "" },
+      54 => { type: ["SUB"], installation_type: 5, short_descriptor: "Linear", description: "" },
+      55 => { type: ["SUB"], installation_type: 5, short_descriptor: "Agreed", description: "" },
+      56 => { type: ["EST","SUB"], installation_type: 5, short_descriptor: "Prior to First Read – Agreed", description: "" },
+      57 => { type: ["EST","SUB"], installation_type: 5, short_descriptor: "Customer Class", description: "" },
+      58 => { type: ["EST","SUB"], installation_type: 5, short_descriptor: "Zero", description: "" },
+      61 => { type: ["EST","SUB"], installation_type: 6, short_descriptor: "Previous Year", description: "" },
+      62 => { type: ["EST","SUB"], installation_type: 6, short_descriptor: "Previous Read", description: "" },
+      63 => { type: ["EST","SUB"], installation_type: 6, short_descriptor: "Customer Class", description: "" },
+      64 => { type: ["SUB"], installation_type: 6, short_descriptor: "Agreed", description: "" },
+      65 => { type: ["EST"], installation_type: 6, short_descriptor: "ADL", description: "" },
+      66 => { type: ["SUB"], installation_type: 6, short_descriptor: "Revision", description: "" },
+      67 => { type: ["SUB"], installation_type: 6, short_descriptor: "Customer Read", description: "" },
+      68 => { type: ["EST","SUB"], installation_type: 6, short_descriptor: "Zero", description: "" },
+      71 => { type: ["SUB"], installation_type: 7, short_descriptor: "Recalculation", description: "" },
+      72 => { type: ["SUB"], installation_type: 7, short_descriptor: "Revised Table", description: "" },
+      73 => { type: ["SUB"], installation_type: 7, short_descriptor: "Revised Algorithm", description: "" },
+      74 => { type: ["SUB"], installation_type: 7, short_descriptor: "Agreed", description: "" },
+      75 => { type: ["EST"], installation_type: 7, short_descriptor: "Existing Table", description: "" }
     }
     
     REASON_CODES = {
@@ -220,6 +220,7 @@ module AEMO
       97 => 'Excluded Data',
       98 => 'Parity Error',
       99 => 'Energy Type (Register Changed)'
+      
     }
     
     DATA_STREAM_SUFFIX = {
@@ -370,7 +371,7 @@ module AEMO
       raise ArgumentError, 'QualityMethod does not have valid QualityFlag'      unless QUALITY_FLAGS.keys.include?(csv[intervals_offset + 0][0])
       unless %w(A N V).include?(csv[intervals_offset + 0][0])
         raise ArgumentError, 'QualityMethod does not have valid length'         unless csv[intervals_offset + 0].length == 3
-        raise ArgumentError, 'QualityMethod does not have valid MethodFlag'     unless METHOD_FLAGS.keys.include?(csv[intervals_offset + 0][1..2])
+        raise ArgumentError, 'QualityMethod does not have valid MethodFlag'     unless METHOD_FLAGS.keys.include?(csv[intervals_offset + 0][1..2].to_i)
       end
       unless %w(A N E).include?(csv[intervals_offset + 0][0])
         raise ArgumentError, 'ReasonCode is not valid'      unless REASON_CODES.keys.include?(csv[intervals_offset + 1].to_i)
@@ -392,10 +393,10 @@ module AEMO
         flag ||= { quality_flag: nil, method_flag: nil, reason_code: nil }
         if csv[intervals_offset + 0].length == 3
           flag[:quality_flag] = csv[intervals_offset + 0][0]
-          flag[:method_flag] = csv[intervals_offset + 0][1,2]
+          flag[:method_flag] = csv[intervals_offset + 0][1,2].to_i
         end
         unless csv[intervals_offset + 1].nil?
-          flag[:reason_code] = csv[intervals_offset + 1]
+          flag[:reason_code] = csv[intervals_offset + 1].to_i
         end
       end
       
@@ -431,31 +432,24 @@ module AEMO
         interval_start_point = @interval_data.length - number_of_intervals
       
         # For each of these
-        base_interval_event = { datetime: nil, quality_method: csv[3], reason_code: csv[4], reason_description: csv[5] }
+        base_interval_event = { datetime: nil, quality_method: csv[3], reason_code: (csv[4].nil? ? nil : csv[4].to_i), reason_description: csv[5] }
 
         # Interval Numbers are 1-indexed
         ((csv[1].to_i)..(csv[2].to_i)).each do |i|
           interval_event = base_interval_event.dup
           interval_event[:datetime] = @interval_data[interval_start_point + (i-1)][:datetime]
           interval_events << interval_event
-          
-          method_flag = nil
-          unless (quality_method = interval_event[:quality_method].match(/(\d+)/)[1]).nil?
-            method_flag = METHOD_FLAGS[quality_method][:short_descriptor]
-          end
-          reason_code = nil
-          unless (reason_code = interval_event[:reason_code]).nil?
-            reason_code = REASON_CODES[reason_code.to_i]
+          # Create flag details
+          flag ||= { quality_flag: nil, method_flag: nil, reason_code: nil }
+          unless interval_event[:quality_method].nil?
+            flag[:quality_flag] = interval_event[:quality_method][0]
+            flag[:method_flag] = interval_event[:quality_method][1,2].to_i
           end
-          
-          case csv[3][0]
-          when 'E'
-            @interval_data[interval_start_point + (i-1)][:flag] = ['Estimate',method_flag,reason_code].compact.join(' - ')
-          when 'F'
-            @interval_data[interval_start_point + (i-1)][:flag] = nil
-          when 'S'
-            @interval_data[interval_start_point + (i-1)][:flag] = ['Substitute',method_flag,reason_code].compact.join(' - ')
+          unless interval_event[:reason_code].nil?
+            flag[:reason_code] = interval_event[:reason_code]
           end
+          # Update with flag details
+          @interval_data[interval_start_point + (i-1)][:flag] = flag
         end
         @interval_events += interval_events
       end

data/lib/aemo/version.rb

@@ -22,7 +22,7 @@
 # @author Joel Courtney <euphemize@gmail.com>
 module AEMO
   # aemo version
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 
   # aemo version split amongst different revisions
   MAJOR_VERSION, MINOR_VERSION, REVISION = VERSION.split('.').map(&:to_i)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aemo
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Joel Courtney