Changeset 2680 for simo

Timestamp:

01/10/12 04:02:00 (4 months ago)

Author:

antti

Message:

fix to aggregation output bug #449

Location:

simo/trunk

Files:

• simulator/xml/model_chains/tree_simulator/Chain_update_basic_attributes.xml (modified) (1 diff)
• src/simo/output/aggr.py (modified) (2 diffs)
• src/simo/simulation/caller/predictionmemory.py (modified) (2 diffs)
• src/simo/simulation/sim.py (modified) (3 diffs)

simo/trunk/simulator/xml/model_chains/tree_simulator/Chain_update_basic_attributes.xml

@@ -487 +487 @@
                                 </model>
                         </task>
-
                         <task name="Calculate for non-seedling stand">
                                 <condition>comp_unit:pure_seedling eq 0</condition>

simo/trunk/src/simo/output/aggr.py

@@ -441 +441 @@
                                                constraints=constraints)
                 data2 = set([d for d in data2])
+                # sort data2 by date and reverse it
+                data2 = sorted(data2, key=lambda row: row[1])
+                data2.reverse()                
                 for range in date_ranges:
                     for row in data:
@@ -449 +452 @@
                                 continue
                             if row[0] == row2[0]:
+                                # in case single range contains records at
+                                # multiple dates, we should take the key
+                                # values from the last record (which should be
+                                # the first item in reversed data2)
+                                if len(row[3:]) >= len(keys):
+                                    continue
                                 row += row2[2:]
             data = [d[1:] for d in data]

simo/trunk/src/simo/simulation/caller/predictionmemory.py

@@ -132 +132 @@
             orig_timesteps = self._time_steps[tind[:,0],tind[:,1],tind[:,2],ind]
             no_block = timesteps != orig_timesteps
-
             block = enddate >= cdates
             if numpy.any(timesteps < 0):
@@ -172 +171 @@
         # time span unit are the same, and if not, modify the time divider
         # and time steps accordingly
-        timesteps, timedivider = self._match_spans(sim, timeunit,
-                                                   sim.timespan.unit,
-                                                timespan, timesteps)
+        timesteps, timedivider = self._match_spans(sim, timeunit,\
+                                    sim.timespan.unit, timespan, timesteps)
         if timedivider is None:
             return False

simo/trunk/src/simo/simulation/sim.py

@@ -19 +19 @@
 import numpy
 import time
+import math
 from datetime import date
 from collections import defaultdict
@@ -675 +676 @@
                 if self.terminate:
                     break
-
+                
                 # update chain index
                 self.chain_index += 1
@@ -1089 +1090 @@
                     year_as_units = 1.
                 elif unit == names.MONTH:
-                    units = ((end - start).days - 1.) / 30.
+                    units = ((end - start).days - 1.) / 31.
                     year_as_units = 12.
-                steps = int(units / self.timespan.time_step) + 1
+                steps = math.ceil(units / self.timespan.time_step)
                 timesteps[:] = year_as_units / steps