Changeset 450

Timestamp:

08/20/10 18:14:40 (18 months ago)

Author:

emuller

Message:

First prototype of architecture for ParameterSet validation against a schema ... no validation yet, and still some bugs ...

Location:

branches/parameter_set_schema_validation

Files:

• setup.py (modified) (1 diff)
• src/parameters (added)
• src/parameters/__init__.py (moved) (moved from branches/parameter_set_schema_validation/src/parameters.py) (9 diffs)
• src/parameters/validators.py (added)
• test/test_validators.py (added)

branches/parameter_set_schema_validation/setup.py

@@ -14 +14 @@
                 'NeuroTools.spike2.sonpy',
                 'NeuroTools.datastore',
+                'NeuroTools.parameters',
                 'NeuroTools.datastore.django_orm',
                ],

branches/parameter_set_schema_validation/src/parameters/__init__.py

@@ -9 +9 @@
 
 Parameter
-ParameterRange - for specifying a list of possible values for a given parameter.
-ParameterSet   - for representing/managing hierarchical parameter sets.
-ParameterTable - a sub-class of ParameterSet that can represent a table of parameters.
-ParameterSpace - a collection of ParameterSets, representing multiple points in
-                 parameter space.
+ParameterRange  - for specifying a list of possible values for a given parameter.
+ParameterSet    - for representing/managing hierarchical parameter sets.
+ParameterTable  - a sub-class of ParameterSet that can represent a table of parameters.
+ParameterSpace  - a collection of ParameterSets, representing multiple points in
+                  parameter space.
+ParameterSchema - a sub-class of ParameterSet, which may also contain 
+
+
 
 Functions
@@ -28 +31 @@
 from NeuroTools import check_dependency
 from NeuroTools.random import ParameterDist, GammaDist, UniformDist, NormalDist
-
+#from NeuroTools.parameters.validators import schema_checkers_namespace
+#from NeuroTools.parameters.validators import Subclass
 
 def isiterable(x):
@@ -159 +163 @@
     
     @staticmethod
-    def read_from_str(s):
+    def read_from_str(s,update_namespace=None):
         """
         ParameterSet definition s should be a Python dict definition
@@ -185 +189 @@
                                 UniformDist=UniformDist,
                                 NormalDist=NormalDist,
-                                pi=numpy.pi))            
+                                pi=numpy.pi))
+        if update_namespace:
+            global_dict.update(update_namespace)
+
         try:
             D = eval(s, global_dict)
@@ -197 +204 @@
             raise Exception("'%s' is not allowed as a parameter name." % k)
     
-    def __init__(self, initialiser, label=None):
-        
+    def __init__(self, initialiser, label=None, update_namespace=None):
+
         def walk(d, label):
             # Iterate through the dictionary `d`, replacing `dict`s by
@@ -228 +235 @@
                 f.close()
 
-            initialiser = ParameterSet.read_from_str(pstr)
+            initialiser = ParameterSet.read_from_str(pstr,update_namespace)
         
         # By this stage, `initialiser` should be a dict. Iterate through it,
@@ -243 +250 @@
                     self[k] = v
         else:
-            raise TypeError("`initialiser` must be a `dict`, a `ParameterSet` object or a valid URL")
-                    
+            raise TypeError("`initialiser` must be a `dict`, a `ParameterSet` object, a string, or a valid URL")
+
         # Set the label
         if hasattr(initialiser, 'label'):
@@ -256 +263 @@
         self.names = self.keys
         self.parameters = self.items
+
         
     def flat(self):
@@ -298 +306 @@
         else:
             # nested set
-            dict.__getitem__(self,split[0])[split[1]]=value
+            try:
+                dict.__getitem__(self,split[0])[split[1]]=value
+            except KeyError:
+                # setting nested name without parent existing
+                # create parent
+                dict.__setitem__(self,split[0],{})
+                # and try again
+                dict.__getitem__(self,split[0])[split[1]]=value
    
     # should __len__() be the usual dict length, or the flattened length? Probably the former for consistency with dicts