saal 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90aa53b1093427163af28bee630532e79ccefea47de44463641c3e387f038640
-  data.tar.gz: 41fca314cb32d91ca10bfb1982cf7e60a6b584c3c521b8ddcd148b18f465fd86
+  metadata.gz: 1a86991bf6a2c0ddf03cab4c239953c2c4e819f5019145398f4b7a527e928852
+  data.tar.gz: de08c727c732e4afb86cafcdcadfeec1f16fb127d675714b03bf388956bc6646
 SHA512:
-  metadata.gz: ff26de3ff3cca4750a365b9672a82165d449f7c11fb3bd57d7f3f27758636a521d766ae99dc84b50cd30e940453eb30826ad485e44f9e50d723bb5625cd07915
-  data.tar.gz: f93e18eacc3a2eb6555c95b9ea91f74506a39af91c6083ab6dbb3acc1ef2d83387db9ed59a573afcb7bbd1354cfdf7af51ec11122d9f48f287baf273c235debf
+  metadata.gz: db0fe9ccfd6e51da7bec292c9cd44c0b8c994ca238772cd817941f22f823f8ac8098ef005373e2f86dfcd9d121dc6470bdd3615ba961d1c514c620e8cf399095
+  data.tar.gz: fa64aa3d8cea43fc12e07db8d84def9ba45ca27655dbb95251e7b7c45e8c322b5c8ee0f58b02b4c63c9799f15a5db1316e0e174a6b246ee4725887d3ce12d823

data/bin/saal_envoy_read

@@ -31,6 +31,14 @@ def fdisp_dec(val)
   end
 end
 
+def fdispd(val)
+  if val
+    Time.at(val.to_i).strftime("%Y-%m-%d %k:%M:%S")
+  else
+    "n/a"
+  end
+end
+
 def l(vals, name)
   sensor = vals[name]
   if sensor
@@ -137,7 +145,7 @@ inverters = envoy.create_sensors
 puts " Found #{envoy.inverters.size} inverters"
 envoy.inverters.each do |serial|
   puts " INVERTER: #{serial} \
-date:#{l(inverters,"inverters_#{serial}_last_report_date")} \
+date:#{fdispd(l(inverters,"inverters_#{serial}_last_report_date"))} \
 lastWatts:#{l(inverters,"inverters_#{serial}_w_now")} \
 maxWatts:#{l(inverters,"inverters_#{serial}_w_max")} \
 "

data/lib/dbstore.rb

@@ -35,6 +35,32 @@ module SAAL
       db_range("AVG", sensor, from, to)
     end
 
+    def weighted_average(sensor, from, to)
+      total_time = 0
+      total_value = 0.0
+      previous_value = nil
+      start_time = nil
+      initialized = false
+      db_query "SELECT date,value FROM sensor_reads
+                       WHERE sensor = '#{db_quote(sensor.to_s)}'
+                         AND date >= #{from.to_s}
+                         AND date <= #{to.to_s}" do |r|
+        r.each do |row|
+          date = row["date"].to_i
+          value = row["value"].to_f
+          if start_time
+            elapsed = date - start_time
+            total_value += elapsed * previous_value
+            total_time += elapsed
+            initialized = true
+          end
+          start_time = date
+          previous_value = value
+        end
+      end
+      initialized ? total_value / total_time : nil
+    end
+
     def minimum(sensor, from, to)     
       db_range("MIN", sensor, from, to)
     end

data/lib/denkovi.rb

@@ -30,7 +30,7 @@ module SAAL
 
     class OutletGroup
       DEFAULT_TIMEOUT = 2
-      DEFAULT_CACHE_TIMEOUT = 60
+      DEFAULT_CACHE_TIMEOUT = 5
       DEFAULT_OUTLETS = {}
       DEFAULT_DESCRIPTIONS = {}
 

data/lib/dinrelay.rb

@@ -29,7 +29,7 @@ module SAAL
 
     class OutletGroup
       DEFAULT_TIMEOUT = 2
-      DEFAULT_CACHE_TIMEOUT = 60
+      DEFAULT_CACHE_TIMEOUT = 5
 
       attr_accessor :host, :port, :user, :pass, :timeout, :cache_timeout
 

data/lib/envoy.rb

@@ -16,7 +16,7 @@ module SAAL
     class PowerEnergy
       DEFAULT_HOST = "envoy.local"
       DEFAULT_TIMEOUT = 2
-      DEFAULT_CACHE_TIMEOUT = 50
+      DEFAULT_CACHE_TIMEOUT = 5
       DEFAULT_SOURCES = [
         "production_inverters",
         "production_phase1", "production_phase2", "production_phase3", "production_total",
@@ -140,7 +140,7 @@ module SAAL
     class ACQuality
       DEFAULT_HOST = "envoy.local"
       DEFAULT_TIMEOUT = 2
-      DEFAULT_CACHE_TIMEOUT = 50
+      DEFAULT_CACHE_TIMEOUT = 5
       DEFAULT_SOURCES = ["total","phase1","phase2","phase3",]
       DEFAULT_TYPES = ["frequency","voltage"]
       DEFAULT_PREFIX = "ac"

data/lib/saal.rb

@@ -10,7 +10,7 @@ module SAAL
     DBCONF = CONFDIR+"database.yml"
     CHARTSCONF = CONFDIR+"charts.yml"
 
-    VERSION = '0.3.3'
+    VERSION = '0.3.4'
 end
 
 require File.dirname(__FILE__)+'/dbstore.rb'

data/lib/sensor.rb

@@ -72,6 +72,11 @@ module SAAL
       apply_offset @dbstore.average(@name, from, to)
     end
 
+    def weighted_average(from, to)
+      return @mock_opts[:weighted_average] if @mock_opts[:weighted_average]
+      apply_offset @dbstore.weighted_average(@name, from, to)
+    end
+
     def minimum(from, to)
       return @mock_opts[:minimum] if @mock_opts[:minimum]
       apply_offset @dbstore.minimum(@name, from, to)

data/saal.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
 
   s.name              = 'saal'
-  s.version           = '0.3.3'
-  s.date              = '2020-12-28'
+  s.version           = '0.3.4'
+  s.date              = '2021-04-04'
 
   s.summary     = "Thin abstraction layer for interfacing and recording sensors (currently onewire) and actuators (currently dinrelay)"
   s.description = <<EOF

data/test/dbstore_test.rb

@@ -42,6 +42,21 @@ class TestFileStore < Test::Unit::TestCase
     assert_nil @dbstore.average(:test_sensor, 50, 60)
   end
 
+  def test_weighted_average
+    db_setup
+    test_values = [[10, 7.323],[12, 5.432],[23, -2.125], [44, 0.123]]
+    test_average = ((12-10)*7.323+(23-12)*5.432+(44-23)*(-2.125)) / (44-10)
+    test_values.each do |values|
+      @dbstore.write(:test_sensor, *values)
+    end
+
+    assert_instance_of Float, @dbstore.average(:test_sensor, 10, 44)
+    assert_in_delta test_average, @dbstore.weighted_average(:test_sensor, 10, 44), 0.001
+
+    # when there are no points it's nil
+    assert_nil @dbstore.weighted_average(:test_sensor, 50, 60)
+  end
+
   def test_min_max
     db_setup
     test_values = [[10, 7.323],[12, 5.432],[23, -2.125], [44, 0.123]]

data/test/sensor_test.rb

@@ -31,6 +31,9 @@ class MockDBStore
   def average(sensor, from, to)
     @value
   end
+  def weighted_average(sensor, from, to)
+    @value
+  end
   def minimum(sensor, from, to)
     @value
   end
@@ -112,6 +115,7 @@ class TestSensor < Test::Unit::TestCase
     assert_equal corrected, sensor.minimum(0,100)
     assert_equal corrected, sensor.maximum(0,100)
     assert_equal corrected, sensor.average(0,100)
+    assert_equal corrected, sensor.weighted_average(0,100)
   end
 
   def test_linear_correction
@@ -125,6 +129,7 @@ class TestSensor < Test::Unit::TestCase
     assert_equal corrected, sensor.minimum(0,100)
     assert_equal corrected, sensor.maximum(0,100)
     assert_equal corrected, sensor.average(0,100)
+    assert_equal corrected, sensor.weighted_average(0,100)
   end
 
   def test_sensor_type
@@ -145,9 +150,10 @@ class TestSensor < Test::Unit::TestCase
     assert_equal 2.0, @mockable.read
     @mockable.write(3.0)
     assert_equal 3.0, @mockable.read
-    @mockable.mock_set(:minimum => 1.0, :average => 2.0, :maximum => 3.0, :last_value => 5.0)
+    @mockable.mock_set(:minimum => 1.0, :average => 2.0, :weighted_average => 2.5, :maximum => 3.0, :last_value => 5.0)
     assert_equal 1.0, @mockable.minimum(0,100)
     assert_equal 2.0, @mockable.average(0,100)
+    assert_equal 2.5, @mockable.weighted_average(0,100)
     assert_equal 3.0, @mockable.maximum(0,100)
     assert_equal 5.0, @mockable.last_value
     assert_equal 3.0, @mockable.read

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saal
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Pedro Côrte-Real
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-28 00:00:00.000000000 Z
+date: 2021-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ownet