Changeset 3017
- Timestamp:
- Sep 16, 2010 6:27:20 PM (11 years ago)
- Location:
- coopr.pyomo/trunk/coopr/pyomo
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
coopr.pyomo/trunk/coopr/pyomo/data/parse_datacmds.py
r2998 r3017 55 55 "WORD", 56 56 "WORDWITHINDEX", 57 "WORDWITHSQUOTEDINDEX", 58 "WORDWITHDQUOTEDINDEX", 57 59 "STRING", 58 60 "QUOTEDSTRING", … … 93 95 return t 94 96 97 def t_WORDWITHSQUOTEDINDEX(t): 98 r'[a-zA-Z_0-9][a-zA-Z_0-9\.\-]*\[\'[a-zA-Z_0-9\.\-,\* ]*\'\]' 99 t.type = reserved.get(t.value,'WORDWITHSQUOTEDINDEX') # Check for reserved words 100 return t 101 102 def t_WORDWITHDQUOTEDINDEX(t): 103 r'[a-zA-Z_0-9][a-zA-Z_0-9\.\-]*\["[a-zA-Z_0-9\.\-,\* ]*"\]' 104 t.type = reserved.get(t.value,'WORDWITHDQUOTEDINDEX') # Check for reserved words 105 return t 106 95 107 def t_WORD(t): 96 108 r'[a-zA-Z_0-9][a-zA-Z_0-9\.+\-]*' … … 184 196 | SET WORDWITHINDEX COLONEQ setdecl SEMICOLON 185 197 | SET WORDWITHINDEX COLONEQ SEMICOLON 198 | SET WORDWITHSQUOTEDINDEX COLONEQ setdecl SEMICOLON 199 | SET WORDWITHSQUOTEDINDEX COLONEQ SEMICOLON 200 | SET WORDWITHDQUOTEDINDEX COLONEQ setdecl SEMICOLON 201 | SET WORDWITHDQUOTEDINDEX COLONEQ SEMICOLON 186 202 | PARAM items COLONEQ paramdecl SEMICOLON 187 203 | IMPORT importdecl SEMICOLON … … 322 338 '''item : WORD 323 339 | WORDWITHINDEX 340 | WORDWITHSQUOTEDINDEX 341 | WORDWITHDQUOTEDINDEX 324 342 | NONWORD 325 343 | STRING -
coopr.pyomo/trunk/coopr/pyomo/data/process_data.py
r3016 r3017 383 383 ans.append(tmp) 384 384 except ValueError: 385 ans.append(val) 385 if val[0] == "'" or val[0] == '"': 386 ans.append(val[1:-1]) 387 else: 388 ans.append(val) 386 389 if pyomo.debug("reader"): #pragma:nocover 387 390 print "DEBUG: _data_eval(end)",ans -
coopr.pyomo/trunk/coopr/pyomo/tests/unit/test_set.py
r3016 r3017 2137 2137 self.instance = self.model.create(currdir+"setA.dat") 2138 2138 self.failUnlessEqual( len(self.instance.E), 5) 2139 2140 def test_io10(self): 2141 OUTPUT=open(currdir+"setA.dat","w") 2142 print >>OUTPUT, "data;" 2143 print >>OUTPUT, "set A := 'A1 x' ' A2' \"A3\";" 2144 print >>OUTPUT, "set F['A1 x'] := 1 3 5;" 2145 print >>OUTPUT, "set F[\" A2\"] := 2 4 6;" 2146 print >>OUTPUT, "set F['A3'] := 3 5 7;" 2147 print >>OUTPUT, "end;" 2148 OUTPUT.close() 2149 self.model.A = Set() 2150 self.model.F = Set(self.model.A) 2151 self.instance = self.model.create(currdir+"setA.dat") 2152 self.failUnlessEqual( self.instance.F.dim(), 1) 2153 self.failUnlessEqual( len(self.instance.F.keys()), 3) 2154 self.failUnlessEqual( len(self.instance.F['A1 x']), 3) 2139 2155 2140 2156
Note: See TracChangeset
for help on using the changeset viewer.