Changeset 3020

Timestamp:

Sep 19, 2010 2:34:40 AM (11 years ago)

Author:

wehart

Message:

Changes to the processing of header information to omit headers that are not
specified in a mapped_header array. This allows subsets of a specified
relational table to be selected by an 'import' command.

File:

• coopr.pyomo/trunk/coopr/pyomo/data/TableData.py (modified) (5 diffs)

coopr.pyomo/trunk/coopr/pyomo/data/TableData.py

@@ -82 +82 @@
                 if header in self.options.param_name:
                     mapped_headers.append(self.options.param_name[header])
-                else:
-                    mapped_headers.append(header)
         #print "X", mapped_headers, self.options.param_name, \
         #           self.options.index, self.options.format
@@ -112 +110 @@
 
             self._info = ["set",self.options.set, ":"]
-            self._info = self._info + list(mapped_headers[1:])
+            self._info = self._info + list(headers[1:])
             self._info = self._info + [":="]
             for row in rows:
@@ -119 +117 @@
         elif self.options.format == 'transposed_array':
             self._info = ["param",self.options.param,"(tr)",":"]              \
-                       + mapped_headers[1:]
+                       + headers[1:]
             self._info.append(":=")
             for row in rows:
@@ -125 +123 @@
 
         elif self.options.format == 'array':
-            self._info = ["param",self.options.param,":"] + mapped_headers[1:]
+            self._info = ["param",self.options.param,":"] + headers[1:]
             self._info.append(":=")
             for row in rows:
@@ -155 +153 @@
             msg = "Unknown parameter format: '%s'"
             raise ValueError, msg % self.options.format
+        #print "FINAL",self._info