From bcc3581e4aaef00f82da24e94fdd91c30314290b Mon Sep 17 00:00:00 2001
From: Random Hacker <random_hacker@xapek.org>
Date: Tue, 31 Aug 2010 16:33:23 +0200
Subject: supsmu entfernt

---
 test.r | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'test.r')

diff --git a/test.r b/test.r
index 8a5885b..41a4b85 100755
--- a/test.r
+++ b/test.r
@@ -41,20 +41,19 @@ readNumericSensorDay <- function (sensorName) {
               "   AND timestamp > now() - interval '1 day'",
               " ORDER BY timestamp desc", sep=""))
     d$timestamp <- as.POSIXct(round(d$timestamp, "mins"))
-    d <- supsmu(as.vector(d$timestamp), as.vector(d$value))
+    #d <- supsmu(as.vector(d$timestamp), as.vector(d$value))
     names(d) <- c("time", "value")
     
-#    myMean <- function(values) {
-#      print(mad(values))
-#      if (mad(values) > 1) {
-#        print(paste("Streiche ",length(values),
-#                    " Werte aus",sensorName,
-#                    "mad =", mad(values)))
-#        values <- values * NA
-#      }
-#      mean(values)
-#    }
-#
+    myMean <- function(values) {
+      if (mad(values) > 2) {
+        print(paste("Streiche ",length(values),
+                    " Werte aus",sensorName,
+                    "mad =", mad(values)))
+        values <- values * NA
+      }
+      mean(values)
+    }
+
 #    dm <- aggregate(d$value, list(time=d$time), myMean)
     dm <- d
     dm$time <- as.POSIXct(dm$time,origin=nulltime)
-- 
cgit v1.2.1


From 228431a46a863c104b5603a498665b012e9ea6c5 Mon Sep 17 00:00:00 2001
From: Random Hacker <random_hacker@xapek.org>
Date: Tue, 31 Aug 2010 23:53:21 +0200
Subject: added Solar Pumpe, fix false values in read numeric by -50 < x < 200

---
 test.r | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

(limited to 'test.r')

diff --git a/test.r b/test.r
index 41a4b85..303a71f 100755
--- a/test.r
+++ b/test.r
@@ -32,6 +32,30 @@ for (i in seq(1,nrow(brenner))) {
 }
 brenner <- brennerBla
 
+#  Solar Pumpe
+solarEngine <- dbGetQuery(con,
+    paste("SELECT timestamp as \"time\",
+                  value_int
+           FROM value
+           WHERE sensor_id IN (select id from sensor where name = 'heizkreisregler9.solarDaten.solarPumpe')
+                AND timestamp > now() - interval '1 day'
+                AND value_int IS NOT NULL
+           ORDER BY timestamp asc", sep=""))
+# reduzieren
+solarEngineNew <- table(NULL,NULL)
+emptyList <- c()
+old_value_int <- "blub"
+for (i in seq(1,nrow(solarEngine))) {
+    if (solarEngine$value_int[i] != old_value_int) {
+        old_value_int <- solarEngine$value_int[i]
+        solarEngineNew <- rbind(solarEngineNew, data.frame(time=solarEngine$time[i], value_int=solarEngine$value_int[i]))
+    }
+}
+solarEngine <- solarEngineNew
+
+print(solarEngine)
+
+# Numerische Sensoren Lesen
 readNumericSensorDay <- function (sensorName) {
     d <- dbGetQuery(con,
         paste("SELECT timestamp",
@@ -39,6 +63,9 @@ readNumericSensorDay <- function (sensorName) {
               "  FROM value",
               " WHERE sensor_id IN (select id from sensor where name = '",sensorName,"')",
               "   AND timestamp > now() - interval '1 day'",
+              # ausreißer ausblenden
+              "   AND COALESCE(value_int,value_float) < 200",
+              "   AND COALESCE(value_int,value_float) > -50",
               " ORDER BY timestamp desc", sep=""))
     d$timestamp <- as.POSIXct(round(d$timestamp, "mins"))
     #d <- supsmu(as.vector(d$timestamp), as.vector(d$value))
@@ -88,6 +115,11 @@ for (i in c(1:nrow(brenner))) {
   text(as.numeric(brenner$time[i]), max(data[2:length(data)],na.rm=TRUE)/2, paste("ab hier", brenner$value_string[i]) ,srt=90)
 }
 
+# quick and dirty add solarEngine to plot
+for (i in c(1:nrow(solarEngine))) {
+    text(as.numeric(solarEngine$time[i]), max(data[2:length(data)],na.rm=TRUE)/2, paste("Solar Pumpe", solarEngine$value_int[i]), srt=90)
+}
+
 rangeX <- as.POSIXct(range(data$time))
 s <- round.POSIXt(seq(rangeX[1], rangeX[2], by=60*60),"hour")
 axis.POSIXct(1, at=s, format="%H:%M")
-- 
cgit v1.2.1


From cfa235d91344cc6c8338d04f0e43dfeadedc1c72 Mon Sep 17 00:00:00 2001
From: Random Hacker <random_hacker@xapek.org>
Date: Wed, 1 Sep 2010 00:40:33 +0200
Subject: played around with solar pump and rectangle

---
 test.r | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'test.r')

diff --git a/test.r b/test.r
index 303a71f..58716e9 100755
--- a/test.r
+++ b/test.r
@@ -53,8 +53,6 @@ for (i in seq(1,nrow(solarEngine))) {
 }
 solarEngine <- solarEngineNew
 
-print(solarEngine)
-
 # Numerische Sensoren Lesen
 readNumericSensorDay <- function (sensorName) {
     d <- dbGetQuery(con,
@@ -116,8 +114,20 @@ for (i in c(1:nrow(brenner))) {
 }
 
 # quick and dirty add solarEngine to plot
+
+rect_start <- 0
+rect_color <- rgb(255, 255, 0, alpha=40, maxColorValue=255)
+
 for (i in c(1:nrow(solarEngine))) {
-    text(as.numeric(solarEngine$time[i]), max(data[2:length(data)],na.rm=TRUE)/2, paste("Solar Pumpe", solarEngine$value_int[i]), srt=90)
+    if (solarEngine$value_int[i] == 1) {
+        rect_start <- solarEngine$time[i];
+    } else if (rect_start != 0) {
+        end <- solarEngine$time[i];
+        # plot
+        rect(rect_start, 0, solarEngine$time[i], 100, col=rect_color,border=F)
+        beginn <- 0
+    }
+    #text(as.numeric(solarEngine$time[i]), max(data[2:length(data)],na.rm=TRUE)/2, paste("Solar Pumpe", solarEngine$value_int[i]), srt=90)
 }
 
 rangeX <- as.POSIXct(range(data$time))
-- 
cgit v1.2.1