humidity: repariert

2 files changed, 35 insertions, 18 deletions

diff --git a/humidity.c b/humidity.c
index 527492b..6aa1cfb 100644
--- a/humidity.c
+++ b/humidity.c
@@ -4,7 +4,11 @@ double maximale_luftfeuchte(double t)
 {
   for (int i=1; i<DAMPF_ANZ; i++)
     if (dampf_temperaturen[i]>=t)
-      return (t-dampf_temperaturen[i-1])*(dampf_feuchten[i]-dampf_feuchten[i-1])/(dampf_temperaturen[i]-dampf_temperaturen[i-1]);
+      return
+          (t - dampf_temperaturen[i-1])
+        * (dampf_feuchten[i] - dampf_feuchten[i-1])
+        / (dampf_temperaturen[i] - dampf_temperaturen[i-1])
+        + dampf_feuchten[i-1];
   return -1;
 }
 
@@ -12,6 +16,10 @@ double taupunkt(double af)
 {
   for (int i=1; i<DAMPF_ANZ; i++)
     if (dampf_feuchten[i]>=af)
-      return (af-dampf_feuchten[i-1])*(dampf_temperaturen[i]-dampf_temperaturen[i-1])/(dampf_feuchten[i]-dampf_feuchten[i-1]);
+      return
+          (af - dampf_feuchten[i-1])
+        * (dampf_temperaturen[i] - dampf_temperaturen[i-1])
+        / (dampf_feuchten[i] - dampf_feuchten[i-1])
+        + dampf_temperaturen[i-1];
   return -1;
 }
diff --git a/humidity.h b/humidity.h
index 2e8b155..23f43b3 100644
--- a/humidity.h
+++ b/humidity.h
@@ -3,25 +3,34 @@
 
 #define DAMPF_ANZ  69
 
-double dampf_temperaturen[DAMPF_ANZ] = {
-  -100, -95, -90, -85, -80, -75, -70, -65, -60, -55, -50, -45, -40, -35,
-  -30, -25, -20, -15, -10, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7,
-  8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
-  26, 27, 28, 29, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90,
-  95, 100
+static double dampf_temperaturen[DAMPF_ANZ] = {
+  -100, -95, -90, -85, -80, -75,
+   -70, -65, -60, -55, -50, -45,
+   -40, -35, -30, -25, -20, -15,
+   -10,  -5,  -4,  -3,  -2,  -1,
+     0,   1,   2,   3,   4,   5,
+     6,   7,   8,   9,  10,  11,
+    12,  13,  14,  15,  16,  17,
+    18,  19,  20,  21,  22,  23,
+    24,  25,  26,  27,  28,  29,
+    30,  35,  40,  45,  50,  55,
+    60,  65,  70,  75,  80,  85,
+    90,  95, 100
 };
 
-double dampf_feuchten[DAMPF_ANZ] = {
+static double dampf_feuchten[DAMPF_ANZ] = {
   1.7465E-5, 4.5752E-5, 1.1373E-4, 2.6939E-4, 6.1013E-4, 1.3260E-3,
-  2.7735E-3, 0.005598, 0.010930, 0.020692, 0.038056, 0.068124, 0.11890,
-  0.20265, 0.33776, 0.55127, 0.88211, 1.3854, 2.1380, 3.2449, 3.5205,
-  3.8172, 4.1363, 4.4794, 4.84795, 5.19317, 5.55921, 5.94766, 6.35967,
-  6.79642, 7.25917, 7.74919, 8.26783, 8.81648, 9.39658, 10.0096,
-  10.6572, 11.3408, 12.0623, 12.8232, 13.6254, 14.4707, 15.3611,
-  16.2984, 17.2848, 18.3224, 19.4132, 20.5596, 21.7638, 23.0283,
-  24.3554, 25.7477, 27.2079, 28.7385, 30.3424, 39.5623, 51.0726,
-  65.3114, 82.7730, 104.011, 129.642, 160.344, 196.863, 240.011,
-  290.669, 349.782, 418.369, 497.511, 588.359
+  2.7735E-3,  0.005598,  0.010930,  0.020692,  0.038056,  0.068124,
+    0.11890,   0.20265,   0.33776,   0.55127,   0.88211,    1.3854,
+     2.1380,    3.2449,    3.5205,    3.8172,    4.1363,    4.4794,
+    4.84795,   5.19317,   5.55921,   5.94766,   6.35967,   6.79642,
+    7.25917,   7.74919,   8.26783,   8.81648,   9.39658,   10.0096,
+    10.6572,   11.3408,   12.0623,   12.8232,   13.6254,   14.4707,
+    15.3611,   16.2984,   17.2848,   18.3224,   19.4132,   20.5596,
+    21.7638,   23.0283,   24.3554,   25.7477,   27.2079,   28.7385,
+    30.3424,   39.5623,   51.0726,   65.3114,   82.7730,   104.011,
+    129.642,   160.344,   196.863,   240.011,   290.669,   349.782,
+    418.369,   497.511,   588.359
 };
 
 double maximale_luftfeuchte(double t);