Commit before mini-release 0.95.9

Author: escheffel

pymaclab/dsge/parsers/_dsgeparser.py

@@ -1370,9 +1370,8 @@ def differ_out(self):
     patup = ('{-10,10}|None','endo|con|exo|other','{-10,10}')
     # Collect some necessary info for steady state substitutions
     var_bar = []
-    varnames = deepcopy(self.vardic)
     for elem in ['con','endo','exo','other']:
-        tmp_li = [x[0].split('(')[0]+'_bar' for x in varnames[elem]['var']]
+        tmp_li = [x[0].split('(')[0]+'_bar' for x in self.vardic[elem]['var']]
         for elem2 in tmp_li:
             var_bar.append(elem2)
     for kk1,elem in enumerate(list_tmp2):

pymaclab/dsge/updaters/one_off.py

@@ -165,11 +165,34 @@ def __str__(self):
         return self.wrapdic.__str__()
 
 class listwrapk:
-    def __init__(self,other,wrapobj,initlev):
+    def __init__(self,other,wrapobj,wrapobj_str,wrapdic,initlev):
         self.other = other
         self.wrapobj = wrapobj
+        self.wrapobj_str = wrapobj_str
+        self.wrapdic = wrapdic
         self.initlev = initlev
         self.wrapli = deepcopy(wrapobj)
+        
+    def reinit(self,other):
+        # Need to copy manually as inner wrapped objects do not support deepcopy
+        if self.wrapobj_str == 'self.vardic':
+            var_keys = []
+            for keyo in other.vardic.keys():
+                var_keys.append(keyo)
+            del other.vardic
+            other.vardic = {}
+            for keyo in var_keys:
+                other.vardic[keyo]={}
+                other.vardic[keyo]['var']=[]
+                other.vardic[keyo]['mod']=[]
+            for keyo1 in self.wrapdic.keys():
+                for keyo2 in self.wrapdic[keyo1].keys():
+                    other.vardic[keyo1][keyo2] = []
+                    for i1,elem1 in enumerate(self.wrapdic[keyo1][keyo2]):
+                        other.vardic[keyo1][keyo2].append([])
+                        for i2,elem2 in enumerate(elem1):
+                            other.vardic[keyo1][keyo2][i1].append(elem2)
+        
 
     def __getattr__(self,attrname):
         return getattr(self.wrapli,attrname)
@@ -187,8 +210,8 @@ def __setslice__(self,ind1,ind2,into):
         if self.wrapli[ind1:ind2] != into:
             self.wrapli[ind1:ind2] = into
             wrapobj[ind1:ind2] = into
-            other.vardic.update(other.updaters.vardic)
-            other.updaters.vardic.wrapobj.update(other.updaters.vardic)            
+            other.updaters.vardic.wrapobj.update(other.updaters.vardic)
+            self.reinit(other)
 
             other.inits.init1a()
 
@@ -225,8 +248,8 @@ def __setitem__(self,ind,into):
         if self.wrapli[ind] != into:
             self.wrapli[ind] = into
             wrapobj[ind] = into
-            other.vardic.update(other.updaters.vardic)
             other.updaters.vardic.wrapobj.update(other.updaters.vardic)
+            self.reinit(other)
 
             other.inits.init1a()
 
@@ -373,7 +396,7 @@ def __init__(self,other,wrapobj_str,initlev):
                 for keyo2 in self.wrapdic[keyo].keys():
                     self.wrapdic[keyo][keyo2] = dicwrapk(other,self.wrapdic[keyo][keyo2],initlev)
                     for i1,elem in enumerate(self.wrapdic[keyo][keyo2]):
-                        self.wrapdic[keyo][keyo2][i1] = listwrapk(other,self.wrapdic[keyo][keyo2][i1],initlev)
+                        self.wrapdic[keyo][keyo2][i1] = listwrapk(other,self.wrapdic[keyo][keyo2][i1],self.wrapobj_str,self.wrapdic,initlev)
 
     def __getattr__(self,attrname):
         return getattr(self.wrapdic,attrname)
@@ -384,12 +407,29 @@ def __setitem__(self,key,value):
         wrapobj = self.wrapobj
         wrapobj[key] = value
         # Test if the dictionary has changed relative to self.wrapdic
-        if self.wrapdic != wrapobj:
+        if self.wrapdic[key] != wrapobj[key]:
             self.wrapdic[key] = value
             ##### THE INITS #####################
             #other.inits.init1()
+            # Need to copy manually as inner wrapped objects do not support deepcopy
             if wrapobj_str == 'self.vardic':
-                other.vardic.upate(wrapobj)
+                var_keys = []
+                for keyo in other.vardic.keys():
+                    var_keys.append(keyo)
+                del other.vardic
+                other.vardic = {}
+                for keyo in var_keys:
+                    other.vardic[keyo]={}
+                    other.vardic[keyo]['var']=[]
+                    other.vardic[keyo]['mod']=[]
+                for keyo1 in self.wrapdic.keys():
+                    for keyo2 in self.wrapdic[keyo1].keys():
+                        other.vardic[keyo1][keyo2] = []
+                        for i1,elem1 in enumerate(self.wrapdic[keyo1][keyo2]):
+                            other.vardic[keyo1][keyo2].append([])
+                            for i2,elem2 in enumerate(elem1):
+                                other.vardic[keyo1][keyo2][i1].append(elem2)
+                            
 
             other.inits.init1a()
             if wrapobj_str == 'self.nlsubsdic':
@@ -431,8 +471,24 @@ def __update__(self,dico):
             self.wrapdic.update(dico)
             ##### THE INITS #####################
             #other.inits.init1()
+            # Need to copy manually as inner wrapped objects do not support deepcopy
             if wrapobj_str == 'self.vardic':
-                other.vardic.upate(self.wrapdic)
+                var_keys = []
+                for keyo in other.vardic.keys():
+                    var_keys.append(keyo)
+                del other.vardic
+                other.vardic = {}
+                for keyo in var_keys:
+                    other.vardic[keyo]={}
+                    other.vardic[keyo]['var']=[]
+                    other.vardic[keyo]['mod']=[]
+                for keyo1 in self.wrapdic.keys():
+                    for keyo2 in self.wrapdic[keyo1].keys():
+                        other.vardic[keyo1][keyo2] = []
+                        for i1,elem1 in enumerate(self.wrapdic[keyo1][keyo2]):
+                            other.vardic[keyo1][keyo2].append([])
+                            for i2,elem2 in enumerate(elem1):
+                                other.vardic[keyo1][keyo2][i1].append(elem2)
 
             other.inits.init1a()
 

pymaclab/dsge/updaters/queued.py

@@ -346,8 +346,21 @@ def __init__(self,other=None):
         self.other = other
         self.queue = other.updaters_queued.queue
         self.initlev = other._initlev
-        # The vardic
-        self.vardic = deepcopy(other.updaters_queued.vardic.wrapobj)
+
+        # The vardic, do manually in order to avoid deepcopy problem with custom instances
+        self.vardic = {}
+        var_keys = []
+        for keyo in other.updaters_queued.vardic.wrapobj.keys():
+            var_keys.append(keyo)
+        for keyo in var_keys:
+            self.vardic[keyo] = {}
+            self.vardic[keyo]['var']= []
+            self.vardic[keyo]['mod']= []
+        for keyo1 in other.updaters_queued.vardic.wrapobj.keys():
+            for keyo2 in other.updaters_queued.vardic.wrapobj[keyo1].keys():
+                self.vardic[keyo1][keyo2]=[]
+                for i1,elem1 in enumerate(other.updaters_queued.vardic.wrapobj[keyo1][keyo2]):
+                    self.vardic[keyo1][keyo2].append([x for x in elem1])
         # The nlsubsdic
         if 'nlsubsdic' in dir(other):
             self.nlsubsdic = deepcopy(other.updaters_queued.nlsubsdic.wrapobj)
@@ -367,8 +380,24 @@ def __init__(self,other=None):
 
     def reinit(self):
         other = self.other
-        # The vardic
-        self.vardic = deepcopy(other.updaters_queued.vardic.wrapobj)
+        # Save the original var categories before deleting original vardic
+        var_keys = []
+        for keyo in self.vardic.keys():
+            var_keys.append(keyo)
+        # Delete and re-build
+        del self.vardic
+        self.vardic = {}
+        for keyo in var_keys:
+            self.vardic[keyo]={}
+            self.vardic[keyo]['var']=[]
+            self.vardic[keyo]['mod']=[]
+        # The vardic, can't use deepcopy because the nested instances don't implement it
+        for keyo1 in other.updaters_queued.vardic.wrapobj.keys():
+            for keyo2 in other.updaters_queued.vardic.wrapobj[keyo1].keys():
+                for i1,elem1 in enumerate(other.updaters_queued.vardic.wrapobj[keyo1][keyo2]):
+                    self.vardic[keyo1][keyo2].append([elem2 for elem2 in elem1])
+                    
+        #self.vardic = deepcopy(other.updaters_queued.vardic.wrapobj)
         # The nlsubsdic
         if 'nlsubsdic' in dir(other):
             self.nlsubsdic = deepcopy(other.updaters_queued.nlsubsdic.wrapobj)

pymaclab/modfiles/models/stable/prog.txt renamed to pymaclab/modfiles/models/development/prog.txt

@@ -35,8 +35,10 @@ def test_others():
     # Remove models which need external file or otherwise don't work
     modelli.remove('rbc1_ext')
     modelli.remove('rbc1_extss')
-    modelli.remove('prog')
     modelli.remove('jermann98_ext')
+    modelli.remove('jermann98')
+    modelli.remove('grohurib03')
+    modelli.remove('merz')
 
     for modelo in modelli:
         print "Now testing for model: ",modelo

pymaclab/tests/pymaclab_tests/modfiles_tests/templates_tests/test_wheezy.py

@@ -4,6 +4,24 @@
 Release History
 ===============
 
+**0.95.9** (2012-12-16)
+==========================
+
+    * Fixed small bug in updater function which should have been fixed for 0.95.8.
+
+
+**0.95.8** (2012-12-15)
+==========================
+    
+    * Introduced indicator function feature in variable substitution section in order to manage discontinuities in FOCs.
+    
+    * The magnitude and sign of shock can now be passed to IRF-generating method.
+    
+    * Certain methods in pymaclab have been refactored and cleaned up considerably, making code more robust.
+
+    * Much work done on getting closer to having a pymaclab-to-dynare translator (but not quite there yet).
+
+
 **0.95.1** (2012-10-8)
 ==========================
 

pymaclab_sphinx/CHANGES

@@ -84,8 +84,8 @@
 # version: The short X.Y version.
 # release: The full version, including alpha/beta/rc tags.
 from cloud_sptheme import __version__ as release
-release = "0.95.1"
-version = "0.95.1"
+release = "0.95.9"
+version = "0.95.9"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

pymaclab_sphinx/docs/conf.py

@@ -36,16 +36,7 @@ First things first
   * Latest source tar ball at `http://pypi.python.org/pypi/pymaclab/ <http://pypi.python.org/pypi/pymaclab/>`_
   * Latest bleeding-edge source via git at `http://github.com/escheffel/pymaclab <http://github.com/escheffel/pymaclab>`_
   * Source code issues tracker at `http://github.com/escheffel/pymaclab/issues/ <http://github.com/escheffel/pymaclab/issues/>`_
-  
-.. note::
 
-    If you want to give PyMacLab a try without installing it onto your own computer you can access an IPython web server frontend in which
-    you can create notebooks (as in Mathematica and Maple) from which calls to Python, Numpy, Scipy and PyMacLab can be made. Plots are
-    directly rendered to screen. Access this experimental web portal at:
-    
-                                   `http://www.notebook.pymaclab.com <http://notebook.pymaclab.com>`_
-    
-    There you will also find provided example scripts which can be run inside your webbrowser.
 
 Features at a Glance
 --------------------
@@ -224,7 +215,7 @@ Option 2
 
   Otherwise get the latest source code compressed as a tarball here:
 
-    `pymaclab.tar.gz <http://pypi.python.org/packages/source/p/pymaclab/pymaclab-0.95.1.tar.gz>`_
+    `pymaclab.tar.gz <http://pypi.python.org/packages/source/p/pymaclab/pymaclab-0.95.8.tar.gz>`_
 
   And install it in the usual way by running in a Linux shell the command::
 

pymaclab_sphinx/docs/index.rst

@@ -1,3 +1,3 @@
 from datetime import datetime
 
-version = '0.95.1'
+version = '0.95.9'