Changeset 2517

Timestamp:

05/20/15 16:30:57 (9 years ago)

Author:

labetoulle

Message:

Add to bilan a line that shows the theoratical two months under-consumption

Location:

TOOLS/ConsoGENCMIP6/bin

Files:

• libconso.py (modified) (1 diff)
• plot_bilan.py (modified) (9 diffs)
• plot_jobs.py (modified) (1 diff)

TOOLS/ConsoGENCMIP6/bin/libconso.py

@@ -249 +249 @@
     n = np.array([utheos[x1], utheos[x2]])
 
+    poly_ok = True
     try:
-      (a, b) = np.linalg.solve(m, n)
+      polynome = np.poly1d(np.linalg.solve(m, n))
     except np.linalg.linalg.LinAlgError:
-      (a, b) = (None, None)
-
-    if a and b:
-      delta = int(round((-b/a)-x1 + 1))
-
-      d1 = dates[x1]
+      poly_ok = False
+
+    if poly_ok:
+      delta = int(round(polynome.r[0] + 1))
+
+      d1 = dates[0]
       self.date_init = d1 + dt.timedelta(days=delta)
     else:

TOOLS/ConsoGENCMIP6/bin/plot_bilan.py

@@ -10 +10 @@
 import os.path
 import datetime as dt
+from dateutil.relativedelta import relativedelta
 import numpy as np
 
@@ -102 +103 @@
     y2 = theo_uses[idx_max]
 
-    m = np.array([
-      [x1, 1.],
-      [x2, 1.]
-    ], dtype="float")
-    n = np.array([
-      y1,
-      y2
-    ], dtype="float")
-
+    m = np.array([[x1, 1.], [x2, 1.]], dtype="float")
+    n = np.array([y1, y2], dtype="float")
+
+    poly_ok = True
     try:
-      (a, b) = np.linalg.solve(m, n)
+      poly_theo = np.poly1d(np.linalg.solve(m, n))
     except np.linalg.linalg.LinAlgError:
-      (a, b) = (None, None)
-
-    if a and b:
+      poly_ok = False
+
+    if poly_ok:
+      delta = (dates[0] + relativedelta(months=2) - dates[0]).days
+
+      poly_delay = np.poly1d(
+        [poly_theo[1], poly_theo[0] - poly_theo[1] * delta]
+      )
+
       for date in dates:
-        self[date].theo_equ = date.timetuple().tm_yday*a + b
+        self.poly_theo = poly_theo
+        self.poly_delay = poly_delay
 
   #---------------------------------------
@@ -161 +164 @@
     self.real_use = real_use
     self.theo_use = theo_use
-    self.theo_equ = np.nan
+    # self.theo_equ = np.nan
     self.run_mean = run_mean
     self.pen_mean = pen_mean
@@ -192 +195 @@
 ########################################
 def plot_data(ax_conso, ax_theo, xcoord, dates,
-              consos, theo_uses, real_uses, theo_equs,
+              consos, theo_uses, real_uses, theo_equs, theo_delay,
               run_mean, pen_mean, run_std, pen_std):
   """
@@ -209 +212 @@
 
   ax_theo.plot(
+    xcoord, real_uses, line_style,
+    color="forestgreen", linewidth=1, markersize=8,
+    solid_capstyle="round", solid_joinstyle="round",
+    label="conso\nréelle (%)"
+  )
+  ax_theo.plot(
     xcoord, theo_equs, "--",
     color="firebrick", linewidth=0.5,
@@ -214 +223 @@
   )
   ax_theo.plot(
-    xcoord, theo_uses, line_style, color="firebrick",
-    linewidth=1, markersize=8,
+    xcoord, theo_uses, line_style,
+    color="firebrick", linewidth=1, markersize=8,
     solid_capstyle="round", solid_joinstyle="round",
     label="conso\nthéorique (%)"
   )
   ax_theo.plot(
-    xcoord, real_uses, line_style, color="forestgreen",
-    linewidth=1, markersize=8,
+    xcoord, theo_delay, ":",
+    color="firebrick", linewidth=0.5,
     solid_capstyle="round", solid_joinstyle="round",
-    label="conso\nréelle (%)"
+    label="retard de\ndeux mois (%)"
   )
 
@@ -439 +448 @@
   theo_uses = np.array([100.*item.theo_use for item in selected_items],
                        dtype=float)
+
   real_uses = np.array([100.*item.real_use for item in selected_items],
                        dtype=float)
-  theo_equs = np.array([100.*item.theo_equ for item in selected_items],
-                       dtype=float)
+  theo_equs = np.array(
+    [100. * bilan.poly_theo(date.timetuple().tm_yday)
+      for date in dates],
+    dtype=float
+  )
+  theo_delay = np.array(
+    [100. * bilan.poly_delay(date.timetuple().tm_yday)
+      for date in dates],
+    dtype=float
+  )
 
   run_mean = np.array([item.run_mean for item in selected_items],
@@ -462 +480 @@
   # -----------------
   plot_data(ax_conso, ax_theo, xcoord, dates,
-            consos, theo_uses, real_uses, theo_equs,
+            consos, theo_uses, real_uses, theo_equs, theo_delay,
             run_mean, pen_mean, run_std, pen_std)
 
@@ -494 +512 @@
 
   exit(0)
-

TOOLS/ConsoGENCMIP6/bin/plot_jobs.py

@@ -351 +351 @@
   bilan = DataDict()
   bilan.init_range(projet.date_init, projet.deadline)
-
   # ... Extract data from file ...
   # ------------------------------