Changeset 2705

Timestamp:

02/02/12 21:50:38 (4 months ago)

Author:

jussi

Message:

fix:text var when combining lexicons / fix:branching forced operation past end date

Location:

simo/trunk/src/simo

Files:

• builder/lexicon/lexicon.py (modified) (1 diff)
• matrix/brancher.py (modified) (11 diffs)

simo/trunk/src/simo/builder/lexicon/lexicon.py

@@ -338 +338 @@
                 self._levels[level].variables[variable] = \
                     copy(lexicon.levels[level].variables[variable])
+                # variable type
+                llevel = lexicon.levels[level]
+                if variable in llevel.categorical:
+                    if len(self._levels[level]._categorical) == 0:
+                        self._levels[level]._categorical = set([variable])
+                    else:
+                        self._levels[level]._categorical.add(variable)
+                elif variable in llevel.numerical:
+                    if len(self._levels[level]._numerical) == 0:
+                        self._levels[level]._numerical = set([variable])
+                    else:
+                        self._levels[level]._numerical.add(variable)
+                elif variable in llevel.textual:
+                    if len(self._levels[level]._textual) == 0:
+                        self._levels[level]._textual = set([variable])
+                    else:
+                        self._levels[level]._textual.add(variable)
         return True
 

simo/trunk/src/simo/matrix/brancher.py

@@ -14 +14 @@
 from collections import defaultdict, deque
 from copy import deepcopy as dc
+from datetime import date
 
 from simo.utils.utils import update_dates
@@ -106 +107 @@
         targets[at_count == 0] = False
         targets *= bb
-        
+
         # make sure that locked tasks are not done
         if numpy.all(targets == False):
@@ -257 +258 @@
                 new[i] = False
         aborted = self._new_branches[self._aborted * new,:]
-        
+
         # get date and timestep information
         cdates = data.get_date(self._new_branches)
@@ -264 +265 @@
         unit = timespan.unit
         ndates = update_dates(cdates, timesteps, unit, deduceaday=True)
-        
+        if timespan.ending.type == 'end_date':
+            end_month = timespan.ending.target.month
+            end_day = timespan.ending.target.day
+            end_year = timespan.ending.target.year
+            end_date = date(end_year, end_month, end_day)
+            for ind in range(len(ndates)):
+                if ndates[ind] > end_date:
+                    ndates[ind] = end_date
+
         # delete aborted objects from prediction and operation memories
         # go through target objects and all their relatives and update the
@@ -281 +290 @@
                 pred_mem.del_objects(it, br, rels, level)
                 oper_mem.del_objects(it, br, rels, level)
-        
+
         # inactivate branches for which branching operations were not done
         data.del_branch(aborted, bg_ind)
-        
+
         # store branching information
         ab = self._aborted
@@ -296 +305 @@
         # dictionary to branching information (history)
         go = self._gokeys
-        
+
         # update active branching task map and
         # the branching dates up to the end date of the current period
         task_ind = self._task_index[bg_name][(self._task.name, branchname)]
-        
+
         if self._branching_info is None:
             self._branching_info = {}
@@ -308 +317 @@
                 key = tuple(nb[i,0:3])
                 self._active_tasks[pb[i,0],pb[i,1],pb[i,2],task_ind] = False
-                # bind the object to the current branching group 
+                # bind the object to the current branching group
                 self._bg_bind[key[0],key[1],key[2]] = bg_ind
                 # if the new branch has already been stored into the branching
@@ -319 +328 @@
                 pkey = tuple(pb[i,:3])
                 fromto[pkey] = key
-        
+
         # copy the queued operation results from the parent branch to
         # the new branch
@@ -332 +341 @@
                 copies.append(tuple(orcopy))
         opres_queue += copies
-                
+
         # update active branching groups
         active_tasks = self._active_tasks[pb[:,0], pb[:,1], pb[:,2], :]
@@ -338 +347 @@
         if numpy.any(active_count == 0):
             m = active_count == 0
-            self._active_bgs[pb[m,0], pb[m,1], pb[m,2], bg_ind] = False      
+            self._active_bgs[pb[m,0], pb[m,1], pb[m,2], bg_ind] = False
         new = dict(pairs)
         self._branching_info.update(new)
@@ -389 +398 @@
             self._task_index[bg_name] = defaultdict(dict)
             tasks = deque([])
-            bg_tasks, fb = bg_item 
+            bg_tasks, fb = bg_item
             # no_op_branch from ini overrides the free_branching attribute
             # from model chain