From ce4aa5800b7a8efa3608f6fa9fa547d724ddf686 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantin=20Ri=DF?= <constantin.riss@dre.de>
Date: Mon, 1 Feb 2010 20:36:16 +0100
Subject: ...

---
 House.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'House.h')

diff --git a/House.h b/House.h
index 68eb237..aab0883 100644
--- a/House.h
+++ b/House.h
@@ -19,7 +19,8 @@ class House
           float roofangle0, float watthoursperhuman, int humans, int heaterenergy0);
           
     std::list<Triangle> getTriangles(){
-      std::list<Triangle> triangles = temp.getTriangles();
+      std::list<Triangle> triangles;
+      triangles = temp.getTriangles();
       return triangles;
     }
 
@@ -28,12 +29,14 @@ class House
     void calcdiff();
     void calcneededenergy();
     void calccollectoroutput(int day, int time, int month);
+    void calcprobeinput(int day, int time, int months);
+    void controller();
     
   private:
     Temparray temp;
     Sun sun;
     float collectortemp, latitude, radiation, eta0, k1, k2, watthoursperhuman, collectorarea,
-          heaterenergy, roofangle, collectoroutput;
+          heaterenergy, roofangle, collectoroutput, probeinput;
     float tempinside[24], tempoutside[12][24], efficiencyflat[100], efficiencyvacuum[100],
           anglecorrectionflat[91], anglecorrectiontransversal[91],
           anglecorrectionlongitudinal[91], tempdifference[12][24], neededenergy[12][24];
-- 
cgit v1.2.3