Next release

src/python/SurrogateModel.py

@@ -692,7 +692,6 @@ def Parse(self, formula, debug=False, model='', stack={}, delim=0, \
         else:
             return model
 
-
 class SurrogateModel(DynamicDocument):
     """Base class for surrogate models.
 
@@ -919,7 +918,7 @@ def new(Min, Max):
                     v.max = min(v.max, i[k].max)
                 else:
                     i[k] = new(v.min, v.max)
-                
+
         return i
 
 
@@ -1205,20 +1204,20 @@ def loadFailing(self):
             __raw__={'outsidePoint': { '$exists': True}}
         ).first()
 
-
     @classmethod
     def loadFromModule(self):
         """Method importing a surrogate model module."""
         collection = self._get_collection()
         doc = collection.find_one({ '_cls': { '$exists': False}})
         modName = re.search('(.*)(\[.*\])?', doc['_id']).group(1)
+        #TODO: This solution still requires the user to give the modena
+        #      application the same name as the surrogate model '_id'
         try:
             mod = __import__(modName)
             return (i for i in modena.BackwardMappingModel.get_instances() if i._id == modName).next()
         except ImportError:
             print "Could not find MoDeNa model '%s'" %(modName)
 
-
     @classmethod
     def get_instances(self):
         """Method returning an iterator over all SurrogateModel instances."""