Changeset 3167

Timestamp:

Oct 26, 2010 10:05:25 PM (10 years ago)

Author:

jwatson

Message:

Restoring older version of rangeset.py - the latest commit caused all kinds of test failures, for reasons I haven't had time to explore.

File:

• coopr.pyomo/trunk/coopr/pyomo/base/rangeset.py (modified) (2 diffs)

coopr.pyomo/trunk/coopr/pyomo/base/rangeset.py

@@ -11 +11 @@
 __all__ = ['RangeSet']
 
-import itertools
 import sets
 import expr
 from numvalue import value
 from pyutilib.component.core import *
-
-def count(start=0, step=1):
-    n = start
-    while True:
-        yield n
-        n += step
 
 class RangeSetValidator(object):
@@ -97 +90 @@
         lb = self._start_val
         ub = self._start_val
-        #for val in xrange(self._start_val, self._end_val+1, self._step_val):
-        for val in itertools.islice(count(self._start_val, self._step_val), (self._end_val-self._start_val+self._step_val-1)//self._step_val):
+        for val in xrange(self._start_val, self._end_val+1, self._step_val):
           if self._verify(val,False):
              ub=val