Changeset 3017

Timestamp:

Sep 16, 2010 6:27:20 PM (9 years ago)

Author:

wehart

Message:

Allowing for indexing with quoted strings. Including a new test
for this case.

Location:

coopr.pyomo/trunk/coopr/pyomo

Files:

• data/parse_datacmds.py (modified) (4 diffs)
• data/process_data.py (modified) (1 diff)
• tests/unit/test_set.py (modified) (1 diff)

coopr.pyomo/trunk/coopr/pyomo/data/parse_datacmds.py

@@ -55 +55 @@
     "WORD",
     "WORDWITHINDEX",
+    "WORDWITHSQUOTEDINDEX",
+    "WORDWITHDQUOTEDINDEX",
     "STRING",
     "QUOTEDSTRING",
@@ -93 +95 @@
     return t
 
+def t_WORDWITHSQUOTEDINDEX(t):
+    r'[a-zA-Z_0-9][a-zA-Z_0-9\.\-]*\[\'[a-zA-Z_0-9\.\-,\* ]*\'\]'
+    t.type = reserved.get(t.value,'WORDWITHSQUOTEDINDEX')    # Check for reserved words
+    return t
+
+def t_WORDWITHDQUOTEDINDEX(t):
+    r'[a-zA-Z_0-9][a-zA-Z_0-9\.\-]*\["[a-zA-Z_0-9\.\-,\* ]*"\]'
+    t.type = reserved.get(t.value,'WORDWITHDQUOTEDINDEX')    # Check for reserved words
+    return t
+
 def t_WORD(t):
     r'[a-zA-Z_0-9][a-zA-Z_0-9\.+\-]*'
@@ -184 +196 @@
                  | SET WORDWITHINDEX COLONEQ setdecl SEMICOLON
                  | SET WORDWITHINDEX COLONEQ SEMICOLON
+                 | SET WORDWITHSQUOTEDINDEX COLONEQ setdecl SEMICOLON
+                 | SET WORDWITHSQUOTEDINDEX COLONEQ SEMICOLON
+                 | SET WORDWITHDQUOTEDINDEX COLONEQ setdecl SEMICOLON
+                 | SET WORDWITHDQUOTEDINDEX COLONEQ SEMICOLON
                  | PARAM items COLONEQ paramdecl SEMICOLON
                  | IMPORT importdecl SEMICOLON
@@ -322 +338 @@
     '''item : WORD
             | WORDWITHINDEX
+            | WORDWITHSQUOTEDINDEX
+            | WORDWITHDQUOTEDINDEX
             | NONWORD
             | STRING

coopr.pyomo/trunk/coopr/pyomo/data/process_data.py

@@ -383 +383 @@
                ans.append(tmp)
              except ValueError:
-               ans.append(val)
+               if val[0] == "'" or val[0] == '"':
+                    ans.append(val[1:-1])
+               else:
+                    ans.append(val)
         if pyomo.debug("reader"):               #pragma:nocover
            print "DEBUG: _data_eval(end)",ans

coopr.pyomo/trunk/coopr/pyomo/tests/unit/test_set.py

@@ -2137 +2137 @@
         self.instance = self.model.create(currdir+"setA.dat")
         self.failUnlessEqual( len(self.instance.E), 5)
+
+    def test_io10(self):
+        OUTPUT=open(currdir+"setA.dat","w")
+        print >>OUTPUT, "data;"
+        print >>OUTPUT, "set A := 'A1 x' ' A2' \"A3\";"
+        print >>OUTPUT, "set F['A1 x'] := 1 3 5;"
+        print >>OUTPUT, "set F[\" A2\"] := 2 4 6;"
+        print >>OUTPUT, "set F['A3'] := 3 5 7;"
+        print >>OUTPUT, "end;"
+        OUTPUT.close()
+        self.model.A = Set()
+        self.model.F = Set(self.model.A)
+        self.instance = self.model.create(currdir+"setA.dat")
+        self.failUnlessEqual( self.instance.F.dim(), 1)
+        self.failUnlessEqual( len(self.instance.F.keys()), 3)
+        self.failUnlessEqual( len(self.instance.F['A1 x']), 3)