<86>Apr 29 14:00:57 userdel[1167259]: delete user 'rooter' <86>Apr 29 14:00:57 userdel[1167259]: removed group 'rooter' owned by 'rooter' <86>Apr 29 14:00:57 groupadd[1167264]: group added to /etc/group: name=rooter, GID=693 <86>Apr 29 14:00:57 groupadd[1167264]: group added to /etc/gshadow: name=rooter <86>Apr 29 14:00:57 groupadd[1167264]: new group: name=rooter, GID=693 <86>Apr 29 14:00:57 useradd[1167268]: new user: name=rooter, UID=693, GID=693, home=/root, shell=/bin/bash <86>Apr 29 14:00:57 userdel[1167274]: delete user 'builder' <86>Apr 29 14:00:57 userdel[1167274]: removed group 'builder' owned by 'builder' <86>Apr 29 14:00:57 userdel[1167274]: removed shadow group 'builder' owned by 'builder' <86>Apr 29 14:00:57 groupadd[1167279]: group added to /etc/group: name=builder, GID=694 <86>Apr 29 14:00:57 groupadd[1167279]: group added to /etc/gshadow: name=builder <86>Apr 29 14:00:57 groupadd[1167279]: new group: name=builder, GID=694 <86>Apr 29 14:00:57 useradd[1167283]: new user: name=builder, UID=694, GID=694, home=/usr/src, shell=/bin/bash <13>Apr 29 14:00:58 rpmi: rpm-macros-python3-0.1.14-alt1 sisyphus+270922.100.1.1 1619661227 installed <13>Apr 29 14:00:58 rpmi: libgdbm-1.8.3-alt10 1454943334 installed <13>Apr 29 14:00:58 rpmi: libexpat-2.2.10-alt1 sisyphus+259966.100.1.1 1602824518 installed <13>Apr 29 14:00:58 rpmi: libp11-kit-0.23.15-alt2 sisyphus+252784.100.2.2 1591274901 installed <13>Apr 29 14:00:58 rpmi: libtasn1-4.16.0-alt1 sisyphus+245480.100.1.1 1580825062 installed <13>Apr 29 14:00:58 rpmi: rpm-macros-alternatives-0.5.1-alt1 sisyphus+226946.100.1.1 1554830426 installed <13>Apr 29 14:00:58 rpmi: alternatives-0.5.1-alt1 sisyphus+226946.100.1.1 1554830426 installed <13>Apr 29 14:00:59 rpmi: ca-certificates-2021.03.24-alt1 sisyphus+268304.300.1.1 1616591829 installed <13>Apr 29 14:00:59 rpmi: ca-trust-0.1.2-alt1 sisyphus+233348.100.1.1 1561653823 installed <13>Apr 29 14:00:59 rpmi: p11-kit-trust-0.23.15-alt2 sisyphus+252784.100.2.2 1591274901 installed <13>Apr 29 14:00:59 rpmi: libcrypto1.1-1.1.1k-alt1 sisyphus+268375.100.1.1 1616684255 installed <13>Apr 29 14:00:59 rpmi: libssl1.1-1.1.1k-alt1 sisyphus+268375.100.1.1 1616684255 installed <13>Apr 29 14:00:59 rpmi: python3-3.9.4-alt1 sisyphus+268966.100.1.1 1617609166 installed <13>Apr 29 14:00:59 rpmi: python3-base-3.9.4-alt1 sisyphus+268966.100.1.1 1617609166 installed <13>Apr 29 14:01:00 rpmi: libpython3-3.9.4-alt1 sisyphus+268966.100.1.1 1617609166 installed <13>Apr 29 14:01:00 rpmi: tests-for-installed-python3-pkgs-0.1.14-alt1 sisyphus+270922.100.1.1 1619661227 installed <13>Apr 29 14:01:00 rpmi: rpm-build-python3-0.1.14-alt1 sisyphus+270922.100.1.1 1619661227 installed <13>Apr 29 14:01:01 rpmi: libpython-2.7.18-alt5 sisyphus+270920.100.1.1 1619657728 installed <13>Apr 29 14:01:01 rpmi: python2-base-2.7.18-alt5 sisyphus+270920.100.1.1 1619657728 installed <13>Apr 29 14:01:02 rpmi: python-modules-encodings-2.7.18-alt5 sisyphus+270920.100.1.1 1619657728 installed <13>Apr 29 14:01:02 rpmi: python-modules-compiler-2.7.18-alt5 sisyphus+270920.100.1.1 1619657728 installed <13>Apr 29 14:01:02 rpmi: python-modules-email-2.7.18-alt5 sisyphus+270920.100.1.1 1619657728 installed <13>Apr 29 14:01:02 rpmi: python-modules-unittest-2.7.18-alt5 sisyphus+270920.100.1.1 1619657728 installed <13>Apr 29 14:01:02 rpmi: python-modules-2.7.18-alt5 sisyphus+270920.100.1.1 1619657728 installed <13>Apr 29 14:01:02 rpmi: python-modules-ctypes-2.7.18-alt5 sisyphus+270920.100.1.1 1619657728 installed <13>Apr 29 14:01:02 rpmi: python-modules-multiprocessing-2.7.18-alt5 sisyphus+270920.100.1.1 1619657728 installed <13>Apr 29 14:01:02 rpmi: python-modules-logging-2.7.18-alt5 sisyphus+270920.100.1.1 1619657728 installed <13>Apr 29 14:01:02 rpmi: python-tools-2to3-2.7.18-alt5 sisyphus+270920.100.1.1 1619657728 installed Building target platforms: i586 Building for target i586 Wrote: /usr/src/in/nosrpm/python3-module-pyeq2-r243-alt2.nosrc.rpm (w1.gzdio) Installing python3-module-pyeq2-r243-alt2.src.rpm Building target platforms: i586 Building for target i586 Executing(%prep): /bin/sh -e /usr/src/tmp/rpm-tmp.60272 + umask 022 + /bin/mkdir -p /usr/src/RPM/BUILD + cd /usr/src/RPM/BUILD + cd /usr/src/RPM/BUILD + rm -rf python3-module-pyeq2-r243 + echo 'Source #0 (python3-module-pyeq2-r243.tar):' Source #0 (python3-module-pyeq2-r243.tar): + /bin/tar -xf /usr/src/RPM/SOURCES/python3-module-pyeq2-r243.tar + cd python3-module-pyeq2-r243 + /bin/chmod -c -Rf u+rwX,go-w . ++ find ./ -type d + for i in $(find ./ -type d) + touch .//__init__.py + for i in $(find ./ -type d) + touch ./UnitTests/__init__.py + for i in $(find ./ -type d) + touch ./UnitTests/NIST_DataFiles/__init__.py + for i in $(find ./ -type d) + touch ./Services/__init__.py + for i in $(find ./ -type d) + touch ./Models_3D/__init__.py + for i in $(find ./ -type d) + touch ./Models_2D/__init__.py + for i in $(find ./ -type d) + touch ./ExtendedVersionHandlers/__init__.py + for i in $(find ./ -type d) + touch ./Examples/__init__.py + for i in $(find ./ -type d) + touch ./Examples/Web/__init__.py + for i in $(find ./ -type d) + touch ./Examples/Web/static/__init__.py + for i in $(find ./ -type d) + touch ./Examples/Simple/__init__.py + for i in $(find ./ -type d) + touch ./Examples/Complex/__init__.py + for i in $(find ./ -type d) + touch ./DesignAndDevelopment/__init__.py + for i in $(find ./ -type d) + touch ./DataCache/__init__.py + for i in $(find ./ -type d) + touch ./.gear/__init__.py + exit 0 Executing(%install): /bin/sh -e /usr/src/tmp/rpm-tmp.54898 + umask 022 + /bin/mkdir -p /usr/src/RPM/BUILD + cd /usr/src/RPM/BUILD + /bin/chmod -Rf u+rwX -- /usr/src/tmp/python3-module-pyeq2-buildroot + : + /bin/rm -rf -- /usr/src/tmp/python3-module-pyeq2-buildroot + PATH=/usr/libexec/rpm-build:/usr/src/bin:/bin:/usr/bin:/usr/X11R6/bin:/usr/games + cd python3-module-pyeq2-r243 + find -type f -name '*.py' -exec 2to3 -w -n '{}' + RefactoringTool: Skipping optional fixer: buffer RefactoringTool: Skipping optional fixer: idioms RefactoringTool: Skipping optional fixer: set_literal RefactoringTool: Skipping optional fixer: ws_comma RefactoringTool: Refactored ./__init__.py RefactoringTool: Refactored ./UnitTests/Test_SolverService.py RefactoringTool: Refactored ./UnitTests/Test_OutputSourceCodeService.py RefactoringTool: Refactored ./UnitTests/Test_NIST.py RefactoringTool: Refactored ./UnitTests/Test_ModelSolveMethods.py RefactoringTool: Refactored ./UnitTests/Test_IndividualPolyFunctions.py RefactoringTool: Refactored ./UnitTests/Test_ExtendedVersionHandlers.py RefactoringTool: Refactored ./UnitTests/Test_Equations.py RefactoringTool: Refactored ./UnitTests/Test_DataConverterService.py RefactoringTool: Refactored ./UnitTests/Test_DataCache.py RefactoringTool: Refactored ./UnitTests/Test_CalculateCoefficientAndFitStatistics.py RefactoringTool: Refactored ./UnitTests/RunAllTests.py RefactoringTool: Refactored ./UnitTests/NIST_TestingUtilities.py RefactoringTool: Refactored ./UnitTests/DataForUnitTests.py RefactoringTool: Refactored ./Services/diffev.py --- ./__init__.py (original) +++ ./__init__.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./UnitTests/Test_SolverService.py (original) +++ ./UnitTests/Test_SolverService.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + import sys, os, types, unittest --- ./UnitTests/Test_OutputSourceCodeService.py (original) +++ ./UnitTests/Test_OutputSourceCodeService.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + import sys, os, unittest, inspect --- ./UnitTests/Test_NIST.py (original) +++ ./UnitTests/Test_NIST.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + import os, sys, unittest --- ./UnitTests/Test_ModelSolveMethods.py (original) +++ ./UnitTests/Test_ModelSolveMethods.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + import sys, os, unittest --- ./UnitTests/Test_IndividualPolyFunctions.py (original) +++ ./UnitTests/Test_IndividualPolyFunctions.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + import sys, os, unittest --- ./UnitTests/Test_ExtendedVersionHandlers.py (original) +++ ./UnitTests/Test_ExtendedVersionHandlers.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + import sys, os, unittest, string --- ./UnitTests/Test_Equations.py (original) +++ ./UnitTests/Test_Equations.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + import sys, os, unittest, inspect --- ./UnitTests/Test_DataConverterService.py (original) +++ ./UnitTests/Test_DataConverterService.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + import sys, os, unittest --- ./UnitTests/Test_DataCache.py (original) +++ ./UnitTests/Test_DataCache.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + import sys, os, unittest --- ./UnitTests/Test_CalculateCoefficientAndFitStatistics.py (original) +++ ./UnitTests/Test_CalculateCoefficientAndFitStatistics.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + import sys, os, unittest --- ./UnitTests/RunAllTests.py (original) +++ ./UnitTests/RunAllTests.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + import unittest import Test_IndividualPolyFunctions --- ./UnitTests/NIST_TestingUtilities.py (original) +++ ./UnitTests/NIST_TestingUtilities.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + import os, sys, math --- ./UnitTests/DataForUnitTests.py (original) +++ ./UnitTests/DataForUnitTests.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + asciiDataInFourColumns_small = ''' 3.017 2.175 0.320 0.1 --- ./Services/diffev.py (original) +++ ./Services/diffev.py (refactored) @@ -1,6 +1,6 @@ -from __future__ impoRefactoringTool: Refactored ./Services/__init__.py RefactoringTool: Refactored ./Services/SolverService.py RefactoringTool: Refactored ./Services/OutputSourceCodeService.py RefactoringTool: Refactored ./Services/DataConverterService.py RefactoringTool: Refactored ./PolyFunctions.py RefactoringTool: Refactored ./Models_3D/__init__.py RefactoringTool: Refactored ./Models_3D/UserDefinedFunction.py rt print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + """Differential Evolution Optimization @@ -300,7 +300,7 @@ Return best parameter vector from the entire run. """ - for gen in xrange(self.generations+1, self.generations+newgens+1): + for gen in range(self.generations+1, self.generations+newgens+1): for candidate in range(self.npop): trial = self.get_trial(candidate) --- ./Services/__init__.py (original) +++ ./Services/__init__.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Services/SolverService.py (original) +++ ./Services/SolverService.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Services/OutputSourceCodeService.py (original) +++ ./Services/OutputSourceCodeService.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Services/DataConverterService.py (original) +++ ./Services/DataConverterService.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # @@ -12,7 +12,7 @@ # # License: BSD-style (see LICENSE.txt in main source directory) -import StringIO # cStringIO is not safe for Unicode comments, use StringIO instead +import io # cStringIO is not safe for Unicode comments, use StringIO instead import numpy numpy.seterr(all= 'ignore') @@ -49,7 +49,7 @@ minimumNumberOfTokens = inModel.GetDimensionality() # StringIO() allows using file methods on text - rawData = StringIO.StringIO(inRawData).readlines() + rawData = io.StringIO(inRawData).readlines() # OK, now load in the data dataLists = [[], [], [], []] --- ./PolyFunctions.py (original) +++ ./PolyFunctions.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_3D/__init__.py (original) +++ ./Models_3D/__init__.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_3D/UserDefinedFunction.py (original) +++ ./Models_3D/UserDefinedFunction.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # @@ -21,7 +21,7 @@ import numpy # implicitly required by compiling the userFunctionCodeObject in the method EvaluateCachedData() below numpy.seterr(all= 'ignore') -import StringIO, parser, types +import io, parser, types @@ -72,9 +72,9 @@ def GetTokensFromTupleParsingHelper(self, tup, inList=None): if inList is None: inList = [] - if type(tup) is types.TupleType: + if type(tup) is tuple: tupleLength = len(tup) - if tupleLength > 1 and type(tup[0]) is not types.TupleType: + if tupleLength > 1 and type(tup[0]) is not tuple: if tup[0] == 1: inList.append(tup[1]) if tupleLength == 2: # so a caret character can be trapped later @@ -101,7 +101,7 @@ # no blank RefactoringTool: Refactored ./Models_3D/Trigonometric.py RefactoringTool: Refactored ./Models_3D/TaylorSeries.py RefactoringTool: Refactored ./Models_3D/Spline.py RefactoringTool: Refactored ./Models_3D/Simple.py RefactoringTool: Refactored ./Models_3D/Sigmoidal.py RefactoringTool: Refactored ./Models_3D/RomanSurfaces.py RefactoringTool: Refactored ./Models_3D/Rational.py RefactoringTool: Refactored ./Models_3D/Power.py RefactoringTool: Refactored ./Models_3D/Polynomial.py RefactoringTool: Refactored ./Models_3D/Polyfunctional.py RefactoringTool: Refactored ./Models_3D/Peak.py RefactoringTool: Refactored ./Models_3D/Optical.py RefactoringTool: Refactored ./Models_3D/NIST.py lines of text, StringIO() allows using file methods on text stringToConvert = '' - rawData = StringIO.StringIO(inString).readlines() + rawData = io.StringIO(inString).readlines() for line in rawData: stripped = line.strip() --- ./Models_3D/Trigonometric.py (original) +++ ./Models_3D/Trigonometric.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_3D/TaylorSeries.py (original) +++ ./Models_3D/TaylorSeries.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_3D/Spline.py (original) +++ ./Models_3D/Spline.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_3D/Simple.py (original) +++ ./Models_3D/Simple.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_3D/Sigmoidal.py (original) +++ ./Models_3D/Sigmoidal.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_3D/RomanSurfaces.py (original) +++ ./Models_3D/RomanSurfaces.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_3D/Rational.py (original) +++ ./Models_3D/Rational.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_3D/Power.py (original) +++ ./Models_3D/Power.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_3D/Polynomial.py (original) +++ ./Models_3D/Polynomial.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_3D/Polyfunctional.py (original) +++ ./Models_3D/Polyfunctional.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_3D/Peak.py (original) +++ ./Models_3D/Peak.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_3D/Optical.py (original) +++ ./Models_3D/Optical.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes --- ./Models_3D/NIST.py (original) +++ ./Models_3D/NIST.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection oRefactoringTool: Refactored ./Models_3D/Miscellaneous.py RefactoringTool: Refactored ./Models_3D/Logarithmic.py RefactoringTool: Refactored ./Models_3D/Exponential.py RefactoringTool: Refactored ./Models_3D/EnzymeKinetics.py RefactoringTool: Refactored ./Models_3D/BioScience.py RefactoringTool: Refactored ./Models_2D/__init__.py RefactoringTool: Refactored ./Models_2D/YieldDensity.py RefactoringTool: Refactored ./Models_2D/UserDefinedFunction.py RefactoringTool: Refactored ./Models_2D/Trigonometric.py RefactoringTool: Refactored ./Models_2D/Spline.py f equations expressed as Python classes # --- ./Models_3D/Miscellaneous.py (original) +++ ./Models_3D/Miscellaneous.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_3D/Logarithmic.py (original) +++ ./Models_3D/Logarithmic.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_3D/Exponential.py (original) +++ ./Models_3D/Exponential.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_3D/EnzymeKinetics.py (original) +++ ./Models_3D/EnzymeKinetics.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_3D/BioScience.py (original) +++ ./Models_3D/BioScience.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_2D/__init__.py (original) +++ ./Models_2D/__init__.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_2D/YieldDensity.py (original) +++ ./Models_2D/YieldDensity.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_2D/UserDefinedFunction.py (original) +++ ./Models_2D/UserDefinedFunction.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # @@ -21,7 +21,7 @@ import numpy # implicitly required by compiling the userFunctionCodeObject in the method EvaluateCachedData() below numpy.seterr(all= 'ignore') -import StringIO, parser, types +import io, parser, types import pyeq2.Model_2D_BaseClass @@ -70,9 +70,9 @@ def GetTokensFromTupleParsingHelper(self, tup, inList=None): if inList is None: inList = [] - if type(tup) is types.TupleType: + if type(tup) is tuple: tupleLength = len(tup) - if tupleLength > 1 and type(tup[0]) is not types.TupleType: + if tupleLength > 1 and type(tup[0]) is not tuple: if tup[0] == 1: inList.append(tup[1]) if tupleLength == 2: # so a caret character can be trapped later @@ -99,7 +99,7 @@ # no blank lines of text, StringIO() allows using file methods on text stringToConvert = '' - rawData = StringIO.StringIO(inString).readlines() + rawData = io.StringIO(inString).readlines() for line in rawData: stripped = line.strip() --- ./Models_2D/Trigonometric.py (original) +++ ./Models_2D/Trigonometric.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_2D/Spline.py (original) +++ ./Models_2D/Spline.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__RefactoringTool: Refactored ./Models_2D/Simple.py RefactoringTool: Refactored ./Models_2D/Sigmoidal.py RefactoringTool: Refactored ./Models_2D/Rational.py RefactoringTool: Refactored ./Models_2D/Power.py RefactoringTool: Refactored ./Models_2D/Polynomial.py RefactoringTool: Refactored ./Models_2D/Polyfunctional.py RefactoringTool: Refactored ./Models_2D/Peak.py RefactoringTool: Refactored ./Models_2D/Optical.py RefactoringTool: Refactored ./Models_2D/NIST.py RefactoringTool: Refactored ./Models_2D/Miscellaneous.py RefactoringTool: Refactored ./Models_2D/Logarithmic.py RefactoringTool: Refactored ./Models_2D/LegendrePolynomial.py RefactoringTool: Refactored ./Models_2D/FourierSeries.py RefactoringTool: Refactored ./Models_2D/Exponential.py import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_2D/Simple.py (original) +++ ./Models_2D/Simple.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_2D/Sigmoidal.py (original) +++ ./Models_2D/Sigmoidal.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_2D/Rational.py (original) +++ ./Models_2D/Rational.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_2D/Power.py (original) +++ ./Models_2D/Power.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_2D/Polynomial.py (original) +++ ./Models_2D/Polynomial.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_2D/Polyfunctional.py (original) +++ ./Models_2D/Polyfunctional.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_2D/Peak.py (original) +++ ./Models_2D/Peak.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_2D/Optical.py (original) +++ ./Models_2D/Optical.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_2D/NIST.py (original) +++ ./Models_2D/NIST.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_2D/Miscellaneous.py (original) +++ ./Models_2D/Miscellaneous.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_2D/Logarithmic.py (original) +++ ./Models_2D/Logarithmic.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_2D/LegendrePolynomial.py (original) +++ ./Models_2D/LegendrePolynomial.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_2D/FourierSeries.py (original) +++ ./Models_2D/FourierSeries.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_2D/Exponential.py (original) +++ ./Models_2D/Exponential.py (refactored) @@ -1,6 +1,6 @@ -from RefactoringTool: Refactored ./Models_2D/Engineering.py RefactoringTool: Refactored ./Models_2D/BurkardtCollectionBased.py RefactoringTool: Refactored ./Models_2D/BioScience.py RefactoringTool: Refactored ./Model_3D_BaseClass.py RefactoringTool: Refactored ./Model_2D_BaseClass.py RefactoringTool: Refactored ./IModel.py RefactoringTool: Refactored ./ExtendedVersionHandlers/__init__.py RefactoringTool: Refactored ./ExtendedVersionHandlers/IExtendedVersionHandler.py RefactoringTool: Refactored ./ExtendedVersionHandlers/ExtendedVersionHandler_ReciprocalWithOffset.py RefactoringTool: Refactored ./ExtendedVersionHandlers/ExtendedVersionHandler_Reciprocal.py RefactoringTool: Refactored ./ExtendedVersionHandlers/ExtendedVersionHandler_Offset.py RefactoringTool: Refactored ./ExtendedVersionHandlers/ExtendedVersionHandler_LinearGrowthAndOffset.py __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_2D/Engineering.py (original) +++ ./Models_2D/Engineering.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_2D/BurkardtCollectionBased.py (original) +++ ./Models_2D/BurkardtCollectionBased.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Models_2D/BioScience.py (original) +++ ./Models_2D/BioScience.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Model_3D_BaseClass.py (original) +++ ./Model_3D_BaseClass.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Model_2D_BaseClass.py (original) +++ ./Model_2D_BaseClass.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./IModel.py (original) +++ ./IModel.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./ExtendedVersionHandlers/__init__.py (original) +++ ./ExtendedVersionHandlers/__init__.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./ExtendedVersionHandlers/IExtendedVersionHandler.py (original) +++ ./ExtendedVersionHandlers/IExtendedVersionHandler.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./ExtendedVersionHandlers/ExtendedVersionHandler_ReciprocalWithOffset.py (original) +++ ./ExtendedVersionHandlers/ExtendedVersionHandler_ReciprocalWithOffset.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./ExtendedVersionHandlers/ExtendedVersionHandler_Reciprocal.py (original) +++ ./ExtendedVersionHandlers/ExtendedVersionHandler_Reciprocal.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./ExtendedVersionHandlers/ExtendedVersionHandler_Offset.py (original) +++ ./ExtendedVersionHandlers/ExtendedVersionHandler_Offset.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./ExtendedVersionHandlers/ExtendedVersionHandler_LinearGrowthAndOffset.py (original) +++ ./ExtendedVersionHandlers/ExtendedVersionHandler_LinearGrowthAndOffset.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ imporRefactoringTool: Refactored ./ExtendedVersionHandlers/ExtendedVersionHandler_LinearGrowth.py RefactoringTool: Refactored ./ExtendedVersionHandlers/ExtendedVersionHandler_LinearDecayAndOffset.py RefactoringTool: Refactored ./ExtendedVersionHandlers/ExtendedVersionHandler_LinearDecay.py RefactoringTool: Refactored ./ExtendedVersionHandlers/ExtendedVersionHandler_InverseWithOffset.py RefactoringTool: Refactored ./ExtendedVersionHandlers/ExtendedVersionHandler_Inverse.py RefactoringTool: Refactored ./ExtendedVersionHandlers/ExtendedVersionHandler_ExponentialGrowthAndOffset.py RefactoringTool: Refactored ./ExtendedVersionHandlers/ExtendedVersionHandler_ExponentialGrowth.py RefactoringTool: Refactored ./ExtendedVersionHandlers/ExtendedVersionHandler_ExponentialDecayAndOffset.py RefactoringTool: Refactored ./ExtendedVersionHandlers/ExtendedVersionHandler_ExponentialDecay.py RefactoringTool: Refactored ./ExtendedVersionHandlers/ExtendedVersionHandler_Default.py RefactoringTool: No changes to ./Examples/Web/TextUtils.py RefactoringTool: No changes to ./Examples/Web/GraphUtils.py RefactoringTool: No changes to ./Examples/Web/FlaskFit.py RefactoringTool: Refactored ./Examples/Simple/FixedCoefficient_3D.py t absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./ExtendedVersionHandlers/ExtendedVersionHandler_LinearGrowth.py (original) +++ ./ExtendedVersionHandlers/ExtendedVersionHandler_LinearGrowth.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./ExtendedVersionHandlers/ExtendedVersionHandler_LinearDecayAndOffset.py (original) +++ ./ExtendedVersionHandlers/ExtendedVersionHandler_LinearDecayAndOffset.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./ExtendedVersionHandlers/ExtendedVersionHandler_LinearDecay.py (original) +++ ./ExtendedVersionHandlers/ExtendedVersionHandler_LinearDecay.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./ExtendedVersionHandlers/ExtendedVersionHandler_InverseWithOffset.py (original) +++ ./ExtendedVersionHandlers/ExtendedVersionHandler_InverseWithOffset.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./ExtendedVersionHandlers/ExtendedVersionHandler_Inverse.py (original) +++ ./ExtendedVersionHandlers/ExtendedVersionHandler_Inverse.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./ExtendedVersionHandlers/ExtendedVersionHandler_ExponentialGrowthAndOffset.py (original) +++ ./ExtendedVersionHandlers/ExtendedVersionHandler_ExponentialGrowthAndOffset.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./ExtendedVersionHandlers/ExtendedVersionHandler_ExponentialGrowth.py (original) +++ ./ExtendedVersionHandlers/ExtendedVersionHandler_ExponentialGrowth.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./ExtendedVersionHandlers/ExtendedVersionHandler_ExponentialDecayAndOffset.py (original) +++ ./ExtendedVersionHandlers/ExtendedVersionHandler_ExponentialDecayAndOffset.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./ExtendedVersionHandlers/ExtendedVersionHandler_ExponentialDecay.py (original) +++ ./ExtendedVersionHandlers/ExtendedVersionHandler_ExponentialDecay.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./ExtendedVersionHandlers/ExtendedVersionHandler_Default.py (original) +++ ./ExtendedVersionHandlers/ExtendedVersionHandler_Default.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./Examples/Simple/FixedCoefficient_3D.py (original) +++ ./Examples/Simple/FixedCoefficient_3D.py (refactored) @@ -1,6 +1,6 @@ -from __futuRefactoringTool: Refactored ./Examples/Simple/FitWeightedData_2D.py RefactoringTool: Refactored ./Examples/Simple/FitUserDefinedFunction_2D.py RefactoringTool: Refactored ./Examples/Simple/FitUserData_2D.py RefactoringTool: Refactored ./Examples/Simple/FitUserCustomizablePolynomial_2D.py RefactoringTool: Refactored ./Examples/Simple/FitOneNamedEquation_3D.py RefactoringTool: Refactored ./Examples/Simple/FitOneNamedEquation_2D.py RefactoringTool: Refactored ./Examples/Simple/EstimatedCoefficients_3D.py RefactoringTool: Refactored ./Examples/Simple/CreateExtendedVersionOfOneNamedEquation_2D.py RefactoringTool: Refactored ./Examples/Simple/CompareMultipleFittingAlgorithms_2D.py RefactoringTool: Refactored ./Examples/Simple/CoefficientBounds_2D.py RefactoringTool: Refactored ./Examples/Complex/ListAllStandardEquations_3D.py RefactoringTool: Refactored ./Examples/Complex/ListAllStandardEquations_2D.py RefactoringTool: Refactored ./Examples/Complex/ListAllExtendedVersionsOfEquations_3D.py RefactoringTool: Refactored ./Examples/Complex/ListAllExtendedVersionsOfEquations_2D.py re__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + import os, sys, inspect --- ./Examples/Simple/FitWeightedData_2D.py (original) +++ ./Examples/Simple/FitWeightedData_2D.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + import os, sys, inspect --- ./Examples/Simple/FitUserDefinedFunction_2D.py (original) +++ ./Examples/Simple/FitUserDefinedFunction_2D.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + import os, sys, inspect --- ./Examples/Simple/FitUserData_2D.py (original) +++ ./Examples/Simple/FitUserData_2D.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + import os, sys, inspect --- ./Examples/Simple/FitUserCustomizablePolynomial_2D.py (original) +++ ./Examples/Simple/FitUserCustomizablePolynomial_2D.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + import os, sys, inspect --- ./Examples/Simple/FitOneNamedEquation_3D.py (original) +++ ./Examples/Simple/FitOneNamedEquation_3D.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + import os, sys, inspect --- ./Examples/Simple/FitOneNamedEquation_2D.py (original) +++ ./Examples/Simple/FitOneNamedEquation_2D.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + import os, sys, inspect --- ./Examples/Simple/EstimatedCoefficients_3D.py (original) +++ ./Examples/Simple/EstimatedCoefficients_3D.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + import os, sys, inspect --- ./Examples/Simple/CreateExtendedVersionOfOneNamedEquation_2D.py (original) +++ ./Examples/Simple/CreateExtendedVersionOfOneNamedEquation_2D.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + import os, sys, inspect --- ./Examples/Simple/CompareMultipleFittingAlgorithms_2D.py (original) +++ ./Examples/Simple/CompareMultipleFittingAlgorithms_2D.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + import os, sys, inspect --- ./Examples/Simple/CoefficientBounds_2D.py (original) +++ ./Examples/Simple/CoefficientBounds_2D.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + import os, sys, inspect --- ./Examples/Complex/ListAllStandardEquations_3D.py (original) +++ ./Examples/Complex/ListAllStandardEquations_3D.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + import os, sys, inspect --- ./Examples/Complex/ListAllStandardEquations_2D.py (original) +++ ./Examples/Complex/ListAllStandardEquations_2D.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + import os, sys, inspect --- ./Examples/Complex/ListAllExtendedVersionsOfEquations_3D.py (original) +++ ./Examples/Complex/ListAllExtendedVersionsOfEquations_3D.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + import os, sys, inspect --- ./Examples/Complex/ListAllExtendedVersionsRefactoringTool: Refactored ./Examples/Complex/FitUsingMultipleNonlinearSolvers_2D.py OfEquations_2D.py (original) +++ ./Examples/Complex/ListAllExtendedVersionsOfEquations_2D.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + import os, sys, inspect --- ./Examples/Complex/FitUsingMultipleNonlinearSolvers_2D.py (original) +++ ./Examples/Complex/FitUsingMultipleNonlinearSolvers_2D.py (refactored) @@ -1,8 +1,8 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import - -from __future__ import generators + + + + + import os, sys, inspect, copy # ensure pyeq2 can be imported @@ -27,7 +27,7 @@ if n==0: yield [] else: - for i in xrange(len(items)): + for i in range(len(items)): for cc in UniqueCombinations(items[i+1:],n-1): yield [items[i]]+cc @@ -35,7 +35,7 @@ if n2==0: yield [] else: - for i2 in xrange(len(items2)): + for i2 in range(len(items2)): for cc2 in UniqueCombinations2(items2[i2+1:],n2-1): yield [items2[i2]]+cc2 @@ -156,7 +156,7 @@ pyeq2.dataConvertorService().ConvertAndSortColumnarASCII(rawData, equationInstance, False) equationInstance.dataCache.CalculateNumberOfReducedDataPoints(equationInstance) - if reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints in reducedDataCache: equationInstance.dataCache.reducedDataCacheDictionary = reducedDataCache[equationInstance.numberOfReducedDataPoints] else: equationInstance.dataCache.reducedDataCacheDictionary = {} @@ -173,7 +173,7 @@ print('The', bestResult[9], 'algorithm yielded better results than Levenberg-Marquardt on this data set for a fitting target of', fittingTargetText) print() - if not reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints not in reducedDataCache: reducedDataCache[equationInstance.numberOfReducedDataPoints] = equationInstance.dataCache.reducedDataCacheDictionary @@ -185,7 +185,7 @@ equationCount = 0 maxPolyfunctionalCoefficients = 4 # this value was chosen to make this example more convenient polyfunctionalEquationList = pyeq2.PolyFunctions.GenerateListForPolyfunctionals_2D() -functionIndexList = range(len(polyfunctionalEquationList)) # make a list of function indices to permute +functionIndexList = list(range(len(polyfunctionalEquationList))) # make a list of function indices to permute for coeffCount in range(1, maxPolyfunctionalCoefficients+1): functionCombinations = UniqueCombinations(functionIndexList, coeffCount) @@ -208,7 +208,7 @@ pyeq2.dataConvertorService().ConvertAndSortColumnarASCII(rawData, equationInstance, False) equationInstance.dataCache.CalculateNumberOfReducedDataPoints(equationInstance) - if reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints in reducedDataCache: equationInstance.dataCache.reducedDataCacheDictionary = reducedDataCache[equationInstance.numberOfReducedDataPoints] else: equationInstance.dataCache.reducedDataCacheDictionary = {} @@ -225,7 +225,7 @@ print('The', bestResult[9], 'algorithm yielded better results than Levenberg-Marquardt on this data set for a fitting target of', fittingTargetText) print() - if not reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints not in reducedRefactoringTool: Refactored ./Examples/Complex/FitStatisticalDistributions.py RefactoringTool: Refactored ./Examples/Complex/FitAllEquationsInSeries_NoResultList_2D.py DataCache: reducedDataCache[equationInstance.numberOfReducedDataPoints] = equationInstance.dataCache.reducedDataCacheDictionary equationCount += 1 @@ -259,7 +259,7 @@ pyeq2.dataConvertorService().ConvertAndSortColumnarASCII(rawData, equationInstance, False) equationInstance.dataCache.CalculateNumberOfReducedDataPoints(equationInstance) - if reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints in reducedDataCache: equationInstance.dataCache.reducedDataCacheDictionary = reducedDataCache[equationInstance.numberOfReducedDataPoints] else: equationInstance.dataCache.reducedDataCacheDictionary = {} @@ -276,7 +276,7 @@ print('The', bestResult[9], 'algorithm yielded better results than Levenberg-Marquardt on this data set for a fitting target of', fittingTargetText) print() - if not reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints not in reducedDataCache: reducedDataCache[equationInstance.numberOfReducedDataPoints] = equationInstance.dataCache.reducedDataCacheDictionary @@ -288,7 +288,7 @@ equationCount = 0 maxCoeffs = 3 # arbitrary choice of maximum total coefficients for this example functionList = pyeq2.PolyFunctions.GenerateListForRationals_2D() -functionIndexList = range(len(functionList)) # make a list of function indices +functionIndexList = list(range(len(functionList))) # make a list of function indices for numeratorCoeffCount in range(1, maxCoeffs): numeratorComboList = UniqueCombinations(functionIndexList, numeratorCoeffCount) @@ -320,7 +320,7 @@ pyeq2.dataConvertorService().ConvertAndSortColumnarASCII(rawData, equationInstance, False) equationInstance.dataCache.CalculateNumberOfReducedDataPoints(equationInstance) - if reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints in reducedDataCache: equationInstance.dataCache.reducedDataCacheDictionary = reducedDataCache[equationInstance.numberOfReducedDataPoints] else: equationInstance.dataCache.reducedDataCacheDictionary = {} @@ -337,7 +337,7 @@ print('The', bestResult[9], 'algorithm yielded better results than Levenberg-Marquardt on this data set for a fitting target of', fittingTargetText) print() - if not reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints not in reducedDataCache: reducedDataCache[equationInstance.numberOfReducedDataPoints] = equationInstance.dataCache.reducedDataCacheDictionary equationCount += 1 --- ./Examples/Complex/FitStatisticalDistributions.py (original) +++ ./Examples/Complex/FitStatisticalDistributions.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + import os, sys, inspect, scipy --- ./Examples/Complex/FitAllEquationsInSeries_NoResultList_2D.py (original) +++ ./Examples/Complex/FitAllEquationsInSeries_NoResultList_2D.py (refactored) @@ -1,8 +1,8 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import - -from __future__ import generators + + + + + import os, sys, inspect, copy # ensure pyeq2 can be imported @@ -27,7 +27,7 @@ if n==0: yield [] else: - for i in xrange(len(items)): + for i in range(len(items)): for cc in UniqueCombinations(items[i+1:],n-1): yield [items[i]]+cc @@ -35,7 +35,7 @@ if n2==0: yield [] else: - for i2 in xrange(len(items2)): + for i2 in range(len(items2)): for cc2 in UniqueCombinations2(items2[i2+1:],n2-1): yield [items2[i2]]+cc2 @@ -146,7 +146,7 @@ pyeq2.dataConvertorService().ConvertAndSortColumnarASCII(rawData, equationInstance, False) equationInstance.dataCache.CalculateNumberOfReducedDataPoints(equationInstance) - if reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints in reducedDataCache: equationInstance.dataCache.reducedDataCacheDictionary = reducedDataCache[equationInstance.numberOfReducedDataPoints] else: equationInstance.dataCache.reducedDataCacheDictionary = {} @@ -155,7 +155,7 @@ if result: bestResult = result - if not reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints not in reducedDataCache: reducedDataCache[equationInstance.numberOfReducedDataPoints] = equationInstance.dataCache.reducedDataCacheDictionary @@ -167,7 +167,7 @@ equationCount = 0 maxPolyfunctionalCoefficients = 4 # this value was chosen to make this example more convenient polyfunctionalEquationList = pyeq2.PolyFunctions.GenerateListForPolyfunctionals_2D() -functionIndexList = range(len(polyfunctionalEquationList)) # make a list of function indices to permute +functionIndexList = list(range(len(polyfunctionalEquationList))) # make a list of function indices to permute for coeffCount in range(1, maxPolyfunctionalCoefficients+1): functionCombinations = UniqueCombinations(functionIndexList, coeffCount) @@ -184,7 +184,7 @@ pyeq2.dataConvertorService().ConvertAndSortColumnarASCII(rawData, equationInstance, False) equationInstance.dataCache.CalculateNumberOfReducedDataPoints(equationInstance) - if reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints in reducedDataCache: equationInstance.dataCache.reducedDataCacheDictionary = reducedDataCache[equationInstance.numberOfReducedDataPoints] else: equationInstance.dataCache.reducedDataCacheDictionary = {} @@ -193,7 +193,7 @@ if result: bestResult = result - if not reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints not in reducedDataCache: reducedDataCache[equationInstance.numberOfReducedDataPoints] = equationInstance.dataCache.reducedDataCacheDictionary equationCount += 1 @@ -221,7 +221,7 @@ pyeq2.dataConvertorService().ConvertAndSortColumnarASCII(rawData, equationInstance, False) equationInstance.dataCache.CalculateNumberOfReducedDataPoints(equationInstance) - if reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints in reducedDataCache: equationInstance.dataCache.reducedDataCacheDictionary = reducedDataCache[equationInstance.numberOfReducedDataPoints] else: equationInstance.dataCache.reducedDataCacheDictionary = {} @@ -230,7 +230,7 @@ if result: bestResult = result - if not reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints not in reducedDataCache: reducedDataCache[equationInstance.numberOfReducedDataPoints] = equationInstance.dataCache.reducedDataCacheDictionary @@ -242,7 +242,7 @@ equationCount = 0 maxCoeffs = smoothnessControl # arbitrary choice of maximum total coefficients for this example functionList = pyeqRefactoringTool: Refactored ./Examples/Complex/FitAllEquationsInSeries_LargeResultList_3D.py RefactoringTool: Refactored ./Examples/Complex/FitAllEquationsInSeries_LargeResultList_2D.py 2.PolyFunctions.GenerateListForRationals_2D() -functionIndexList = range(len(functionList)) # make a list of function indices +functionIndexList = list(range(len(functionList))) # make a list of function indices for numeratorCoeffCount in range(1, maxCoeffs): numeratorComboList = UniqueCombinations(functionIndexList, numeratorCoeffCount) @@ -268,7 +268,7 @@ pyeq2.dataConvertorService().ConvertAndSortColumnarASCII(rawData, equationInstance, False) equationInstance.dataCache.CalculateNumberOfReducedDataPoints(equationInstance) - if reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints in reducedDataCache: equationInstance.dataCache.reducedDataCacheDictionary = reducedDataCache[equationInstance.numberOfReducedDataPoints] else: equationInstance.dataCache.reducedDataCacheDictionary = {} @@ -277,7 +277,7 @@ if result: bestResult = result - if not reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints not in reducedDataCache: reducedDataCache[equationInstance.numberOfReducedDataPoints] = equationInstance.dataCache.reducedDataCacheDictionary equationCount += 1 --- ./Examples/Complex/FitAllEquationsInSeries_LargeResultList_3D.py (original) +++ ./Examples/Complex/FitAllEquationsInSeries_LargeResultList_3D.py (refactored) @@ -1,8 +1,8 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import - -from __future__ import generators + + + + + import os, sys, inspect, copy # ensure pyeq2 can be imported @@ -20,7 +20,7 @@ if n==0: yield [] else: - for i in xrange(len(items)): + for i in range(len(items)): for cc in UniqueCombinations(items[i+1:],n-1): yield [items[i]]+cc @@ -144,14 +144,14 @@ pyeq2.dataConvertorService().ConvertAndSortColumnarASCII(rawData, equationInstance, False) equationInstance.dataCache.CalculateNumberOfReducedDataPoints(equationInstance) - if reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints in reducedDataCache: equationInstance.dataCache.reducedDataCacheDictionary = reducedDataCache[equationInstance.numberOfReducedDataPoints] else: equationInstance.dataCache.reducedDataCacheDictionary = {} SetParametersAndFit(equationInstance, resultList, True) - if not reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints not in reducedDataCache: reducedDataCache[equationInstance.numberOfReducedDataPoints] = equationInstance.dataCache.reducedDataCacheDictionary --- ./Examples/Complex/FitAllEquationsInSeries_LargeResultList_2D.py (original) +++ ./Examples/Complex/FitAllEquationsInSeries_LargeResultList_2D.py (refactored) @@ -1,8 +1,8 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import - -from __future__ import generators + + + + + import os, sys, inspect, copy # ensure pyeq2 can be imported @@ -20,7 +20,7 @@ if n==0: yield [] else: - for i in xrange(len(items)): + for i in range(len(items)): for cc in UniqueCombinations(items[i+1:],n-1): yield [items[i]]+cc @@ -28,7 +28,7 @@ if n2==0: yield [] else: - for i2 in xrange(len(items2)): + for i2 in range(len(items2)): for cc2 in UniqueCombinations2(items2[i2+1:],n2-1): yield [items2[i2]]+cc2 @@ -134,14 +134,14 @@ pyeq2.dataConvertorService().ConvertAndSortColumnarASCII(rawData, equationInstance, False) equationInstance.dataCache.CalculateNumberOfReducedDataPoints(equationInstance) - if reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints in reducedDataCache: equationInstance.dataCache.reducedDataCacheDictionary = reducedDataCache[equationInstance.numberOfReducedDataPoints] else: equationInstance.dataCache.reducedDataCacheDictionary = {} SetParametersAndFit(equationInstance, resultList, True) - if not reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints not in reducedDataCache: reducedDataCache[equationInstance.numberOfReducedDataPoints] = equationInstance.dataCache.reducedDataCacheDictionary @@ -153,7 +153,7 @@ equationCount = 0 maxPolyfunctionalCoefficients = 4 # this value was chosen to make this example more convenient polyfunctionalEquationList = pyeq2.PolyFunctions.GenerateListForPolyfunctionals_2D() -functionIndexList = range(len(polyfunctionalEquationList)) # make a list of function indices to permute +functionIndexList = list(range(len(polyfunctionalEquationList))) # make a list of function indices to permute for coeffCount in range(1, maxPolyfunctionalCoefficients+1): functionCombinations = UniqueCombinations(functionIndexList, coeffCount) @@ -170,14 +170,14 @@ pyeq2.dataConvertorService().ConvertAndSortColumnarASCII(rawData, equationInstance, False) equationInstance.dataCache.CalculateNumberOfReducedDataPoints(equationInstance) - if reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints in reducedDataCache: equationInstance.dataCache.reducedDataCacheDictionary = reducedDataCache[equationInstance.numberOfReducedDataPoints] else: equationInstance.dataCache.reducedDataCacheDictionary = {} SetParametersAndFit(equationInstance, resultList, False) - if not reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints not in reducedDataCache: reducedDataCache[equationInstance.numberOfReducedDataPoints] = equationInstance.dataCache.reducedDataCacheDictionary equationCount += 1 @@ -205,14 +205,14 @@ pyeq2.dataConvertorService().ConvertAndSortColumnarASCII(rawData, equationInstance, False) equationInstance.dataCache.CalculateNumberOfReducedDataPoints(equationInstance) - if reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints in reducedDataCache: equationInstance.dataCache.reducedDataCacheDictionary = reducedDataCache[equationInstance.numberOfReducedDataPoints] else: equationInstance.dataCache.reducedDataCacheDictionary = {} SetParametersAndFit(equationInstance, resultList, False) - if not reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints not in reducedDataCache: reducedDataCache[equationInstance.numberOfReducedDataPoints] = equationInstance.dataCache.reducedDataCacheDictionary @@ -224,7 +224,7 @@ equationCount = 0 maxCoeffs = 3 # arbitrary choice of maximum total coefficients for this example functionList = pyeq2.PolyFunctions.GenerateListForRationals_2D() -functionIndexList = range(len(functionList)) # make a list of function indices +functionIndexList = list(range(len(functionList))) # makeRefactoringTool: Refactored ./Examples/Complex/FitAllEquationsInParallel_NoResultList_2D.py a list of function indices for numeratorCoeffCount in range(1, maxCoeffs): numeratorComboList = UniqueCombinations(functionIndexList, numeratorCoeffCount) @@ -250,14 +250,14 @@ pyeq2.dataConvertorService().ConvertAndSortColumnarASCII(rawData, equationInstance, False) equationInstance.dataCache.CalculateNumberOfReducedDataPoints(equationInstance) - if reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints in reducedDataCache: equationInstance.dataCache.reducedDataCacheDictionary = reducedDataCache[equationInstance.numberOfReducedDataPoints] else: equationInstance.dataCache.reducedDataCacheDictionary = {} SetParametersAndFit(equationInstance, resultList, False) - if not reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints not in reducedDataCache: reducedDataCache[equationInstance.numberOfReducedDataPoints] = equationInstance.dataCache.reducedDataCacheDictionary equationCount += 1 --- ./Examples/Complex/FitAllEquationsInParallel_NoResultList_2D.py (original) +++ ./Examples/Complex/FitAllEquationsInParallel_NoResultList_2D.py (refactored) @@ -1,8 +1,8 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import - -from __future__ import generators + + + + + import os, sys, inspect, copy, multiprocessing # ensure pyeq2 can be imported @@ -27,7 +27,7 @@ if n==0: yield [] else: - for i in xrange(len(items)): + for i in range(len(items)): for cc in UniqueCombinations(items[i+1:],n-1): yield [items[i]]+cc @@ -35,7 +35,7 @@ if n2==0: yield [] else: - for i2 in xrange(len(items2)): + for i2 in range(len(items2)): for cc2 in UniqueCombinations2(items2[i2+1:],n2-1): yield [items2[i2]]+cc2 @@ -132,7 +132,7 @@ pyeq2.dataConvertorService().ConvertAndSortColumnarASCII(rawData, equationInstance, False) equationInstance.dataCache.CalculateNumberOfReducedDataPoints(equationInstance) - if reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints in reducedDataCache: equationInstance.dataCache.reducedDataCacheDictionary = reducedDataCache[equationInstance.numberOfReducedDataPoints] else: equationInstance.dataCache.reducedDataCacheDictionary = {} @@ -141,7 +141,7 @@ if result: bestResult = result - if not reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints not in reducedDataCache: reducedDataCache[equationInstance.numberOfReducedDataPoints] = equationInstance.dataCache.reducedDataCacheDictionary @@ -153,7 +153,7 @@ equationCount = 0 maxPolyfunctionalCoefficients = 4 # this value was chosen to make this example more convenient polyfunctionalEquationList = pyeq2.PolyFunctions.GenerateListForPolyfunctionals_2D() - functionIndexList = range(len(polyfunctionalEquationList)) # make a list of function indices to permute + functionIndexList = list(range(len(polyfunctionalEquationList))) # make a list of function indices to permute for coeffCount in range(1, maxPolyfunctionalCoefficients+1): functionCombinations = UniqueCombinations(funcRefactoringTool: Refactored ./Examples/Complex/FitAllEquationsInParallelUsingQueues_LargeResultList_2D.py tionIndexList, coeffCount) @@ -175,7 +175,7 @@ pyeq2.dataConvertorService().ConvertAndSortColumnarASCII(rawData, equationInstance, False) equationInstance.dataCache.CalculateNumberOfReducedDataPoints(equationInstance) - if reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints in reducedDataCache: equationInstance.dataCache.reducedDataCacheDictionary = reducedDataCache[equationInstance.numberOfReducedDataPoints] else: equationInstance.dataCache.reducedDataCacheDictionary = {} @@ -184,7 +184,7 @@ if result: bestResult = result - if not reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints not in reducedDataCache: reducedDataCache[equationInstance.numberOfReducedDataPoints] = equationInstance.dataCache.reducedDataCacheDictionary equationCount += 1 @@ -217,7 +217,7 @@ pyeq2.dataConvertorService().ConvertAndSortColumnarASCII(rawData, equationInstance, False) equationInstance.dataCache.CalculateNumberOfReducedDataPoints(equationInstance) - if reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints in reducedDataCache: equationInstance.dataCache.reducedDataCacheDictionary = reducedDataCache[equationInstance.numberOfReducedDataPoints] else: equationInstance.dataCache.reducedDataCacheDictionary = {} @@ -226,19 +226,19 @@ if result: bestResult = result - if not reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints not in reducedDataCache: reducedDataCache[equationInstance.numberOfReducedDataPoints] = equationInstance.dataCache.reducedDataCacheDictionary ###################### # fit user-selectable rationals here - print + print() print('Process ID', processID, 'fitting user-selectable rationals:') equationCount = 0 maxCoeffs = smoothnessControl # arbitrary choice of maximum total coefficients for this example functionList = pyeq2.PolyFunctions.GenerateListForRationals_2D() - functionIndexList = range(len(functionList)) # make a list of function indices + functionIndexList = list(range(len(functionList))) # make a list of function indices for numeratorCoeffCount in range(1, maxCoeffs): numeratorComboList = UniqueCombinations(functionIndexList, numeratorCoeffCount) @@ -269,7 +269,7 @@ pyeq2.dataConvertorService().ConvertAndSortColumnarASCII(rawData, equationInstance, False) equationInstance.dataCache.CalculateNumberOfReducedDataPoints(equationInstance) - if reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints in reducedDataCache: equationInstance.dataCache.reducedDataCacheDictionary = reducedDataCache[equationInstance.numberOfReducedDataPoints] else: equationInstance.dataCache.reducedDataCacheDictionary = {} @@ -278,7 +278,7 @@ if result: bestResult = result - if not reducedDataCache.has_key(equationInstance.numberOfReducedDataPoints): + if equationInstance.numberOfReducedDataPoints not in reducedDataCache: reducedDataCache[equationInstance.numberOfReducedDataPoints] = equationInstance.dataCache.reducedDataCacheDictionary equationCount += 1 --- ./Examples/Complex/FitAllEquationsInParallelUsingQRefactoringTool: Refactored ./DataCache/__init__.py ueues_LargeResultList_2D.py (original) +++ ./Examples/Complex/FitAllEquationsInParallelUsingQueues_LargeResultList_2D.py (refactored) @@ -1,9 +1,9 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import - -from __future__ import generators -import os, sys, inspect, copy, multiprocessing, Queue + + + + + +import os, sys, inspect, copy, multiprocessing, queue # ensure pyeq2 can be imported if -1 != sys.path[0].find('pyeq2-read-only'):raise Exception('Please rename SVN checkout directory from "pyeq2-read-only" to "pyeq2"') @@ -27,7 +27,7 @@ if n==0: yield [] else: - for i in xrange(len(items)): + for i in range(len(items)): for cc in UniqueCombinations(items[i+1:],n-1): yield [items[i]]+cc @@ -35,7 +35,7 @@ if n2==0: yield [] else: - for i2 in xrange(len(items2)): + for i2 in range(len(items2)): for cc2 in UniqueCombinations2(items2[i2+1:],n2-1): yield [items2[i2]]+cc2 @@ -51,7 +51,7 @@ pyeq2.dataConvertorService().ConvertAndSortColumnarASCII(globalRawData, inEquation, False) inEquation.dataCache.CalculateNumberOfReducedDataPoints(inEquation) - if globalReducedDataCache.has_key(inEquation.numberOfReducedDataPoints): + if inEquation.numberOfReducedDataPoints in globalReducedDataCache: inEquation.dataCache.reducedDataCacheDictionary = globalReducedDataCache[inEquation.numberOfReducedDataPoints] else: inEquation.dataCache.reducedDataCacheDictionary = {} @@ -70,7 +70,7 @@ inEquation.Solve() - if not globalReducedDataCache.has_key(inEquation.numberOfReducedDataPoints): + if inEquation.numberOfReducedDataPoints not in globalReducedDataCache: globalReducedDataCache[inEquation.numberOfReducedDataPoints] = inEquation.dataCache.reducedDataCacheDictionary target = inEquation.CalculateAllDataFittingTarget(inEquation.solvedCoefficients) @@ -137,7 +137,7 @@ # fit polyfunctionals here maxPolyfunctionalCoefficients = smoothnessControl # arbitrary choice of maximum total coefficients for this example polyfunctionalEquationList = pyeq2.PolyFunctions.GenerateListForPolyfunctionals_2D() - functionIndexList = range(len(polyfunctionalEquationList)) # make a list of function indices to permute + functionIndexList = list(range(len(polyfunctionalEquationList))) # make a list of function indices to permute for coeffCount in range(1, maxPolyfunctionalCoefficients+1): functionCombinations = UniqueCombinations(functionIndexList, coeffCount) @@ -183,7 +183,7 @@ # fit user-selectable rationals here maxCoeffs = smoothnessControl # arbitrary choice of maximum total coefficients for this example functionList = pyeq2.PolyFunctions.GenerateListForRationals_2D() - functionIndexList = range(len(functionList)) # make a list of function indices + functionIndexList = list(range(len(functionList))) # make a list of function indices for numeratorCoeffCount in range(1, maxCoeffs): numeratorComboList = UniqueCombinations(functionIndexList, numeratorCoeffCount) @@ -275,8 +275,8 @@ ############################################## # linear fits are very fast - run these in the existing process which saves on interprocess communication overhead -fittingTasksQueue = Queue.Queue(0) -fittingResultsQueue = Queue.Queue(0) +fittingTasksQueue = queue.Queue(0) +fittingResultsQueue = queue.Queue(0) numberOfSerialTasksSubmitted = SubmitTasksToQueue(fittingTasksQueue, fittingTargetText, smoothnessControl, True) if numberOfSerialTasksSubmitted > 0: serialWorker(fittingTasksQueue, fittingResultsQueue) --- ./DataCache/__init__.py (original) +++ ./DataCache/__init__.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as PythonRefactoringTool: Refactored ./DataCache/DataCacheFunctions.py RefactoringTool: Refactored ./DataCache/DataCache.py RefactoringTool: Files that were modified: RefactoringTool: ./__init__.py RefactoringTool: ./UnitTests/Test_SolverService.py RefactoringTool: ./UnitTests/Test_OutputSourceCodeService.py RefactoringTool: ./UnitTests/Test_NIST.py RefactoringTool: ./UnitTests/Test_ModelSolveMethods.py RefactoringTool: ./UnitTests/Test_IndividualPolyFunctions.py RefactoringTool: ./UnitTests/Test_ExtendedVersionHandlers.py RefactoringTool: ./UnitTests/Test_Equations.py RefactoringTool: ./UnitTests/Test_DataConverterService.py RefactoringTool: ./UnitTests/Test_DataCache.py RefactoringTool: ./UnitTests/Test_CalculateCoefficientAndFitStatistics.py RefactoringTool: ./UnitTests/RunAllTests.py RefactoringTool: ./UnitTests/NIST_TestingUtilities.py RefactoringTool: ./UnitTests/DataForUnitTests.py RefactoringTool: ./Services/diffev.py RefactoringTool: ./Services/__init__.py RefactoringTool: ./Services/SolverService.py RefactoringTool: ./Services/OutputSourceCodeService.py RefactoringTool: ./Services/DataConverterService.py RefactoringTool: ./PolyFunctions.py RefactoringTool: ./Models_3D/__init__.py RefactoringTool: ./Models_3D/UserDefinedFunction.py RefactoringTool: ./Models_3D/Trigonometric.py RefactoringTool: ./Models_3D/TaylorSeries.py RefactoringTool: ./Models_3D/Spline.py RefactoringTool: ./Models_3D/Simple.py RefactoringTool: ./Models_3D/Sigmoidal.py RefactoringTool: ./Models_3D/RomanSurfaces.py RefactoringTool: ./Models_3D/Rational.py RefactoringTool: ./Models_3D/Power.py RefactoringTool: ./Models_3D/Polynomial.py RefactoringTool: ./Models_3D/Polyfunctional.py RefactoringTool: ./Models_3D/Peak.py RefactoringTool: ./Models_3D/Optical.py RefactoringTool: ./Models_3D/NIST.py RefactoringTool: ./Models_3D/Miscellaneous.py RefactoringTool: ./Models_3D/Logarithmic.py RefactoringTool: ./Models_3D/Exponential.py RefactoringTool: ./Models_3D/EnzymeKinetics.py RefactoringTool: ./Models_3D/BioScience.py RefactoringTool: ./Models_2D/__init__.py RefactoringTool: ./Models_2D/YieldDensity.py RefactoringTool: ./Models_2D/UserDefinedFunction.py RefactoringTool: ./Models_2D/Trigonometric.py RefactoringTool: ./Models_2D/Spline.py RefactoringTool: ./Models_2D/Simple.py RefactoringTool: ./Models_2D/Sigmoidal.py RefactoringTool: ./Models_2D/Rational.py RefactoringTool: ./Models_2D/Power.py RefactoringTool: ./Models_2D/Polynomial.py RefactoringTool: ./Models_2D/Polyfunctional.py RefactoringTool: ./Models_2D/Peak.py RefactoringTool: ./Models_2D/Optical.py RefactoringTool: ./Models_2D/NIST.py RefactoringTool: ./Models_2D/Miscellaneous.py RefactoringTool: ./Models_2D/Logarithmic.py RefactoringTool: ./Models_2D/LegendrePolynomial.py RefactoringTool: ./Models_2D/FourierSeries.py RefactoringTool: ./Models_2D/Exponential.py RefactoringTool: ./Models_2D/Engineering.py RefactoringTool: ./Models_2D/BurkardtCollectionBased.py RefactoringTool: ./Models_2D/BioScience.py RefactoringTool: ./Model_3D_BaseClass.py RefactoringTool: ./Model_2D_BaseClass.py RefactoringTool: ./IModel.py RefactoringTool: ./ExtendedVersionHandlers/__init__.py RefactoringTool: ./ExtendedVersionHandlers/IExtendedVersionHandler.py RefactoringTool: ./ExtendedVersionHandlers/ExtendedVersionHandler_ReciprocalWithOffset.py RefactoringTool: ./ExtendedVersionHandlers/ExtendedVersionHandler_Reciprocal.py RefactoringTool: ./ExtendedVersionHandlers/ExtendedVersionHandler_Offset.py RefactoringTool: ./ExtendedVersionHandlers/ExtendedVersionHandler_LinearGrowthAndOffset.py RefactoringTool: ./ExtendedVersionHandlers/ExtendedVersionHandler_LinearGrowth.py RefactoringTool: ./ExtendedVersionHandlers/ExtendedVersionHandler_LinearDecayAndOffset.py RefactoringTool: ./ExtendedVersionHandlers/ExtendedVersionHandler_LinearDecay.py RefactoringTool: ./ExtendedVersionHandlers/ExtendedVersionHandler_InverseWithOffset.py RefactoringTool: ./ExtendedVersionHandlers/ExtendedVersionHandler_Inverse.py RefactoringTool: ./ExtendedVersionHandlers/ExtendedVersionHandler_ExponentialGrowthAndOffset.py RefactoringTool: ./ExtendedVersionHandlers/ExtendedVersionHandler_ExponentialGrowth.py RefactoringTool: ./ExtendedVersionHandlers/ExtendedVersionHandler_ExponentialDecayAndOffset.py RefactoringTool: ./ExtendedVersionHandlers/ExtendedVersionHandler_ExponentialDecay.py RefactoringTool: ./ExtendedVersionHandlers/ExtendedVersionHandler_Default.py RefactoringTool: ./Examples/Web/TextUtils.py RefactoringTool: ./Examples/Web/GraphUtils.py RefactoringTool: ./Examples/Web/FlaskFit.py RefactoringTool: ./Examples/Simple/FixedCoefficient_3D.py RefactoringTool: ./Examples/Simple/FitWeightedData_2D.py RefactoringTool: ./Examples/Simple/FitUserDefinedFunction_2D.py RefactoringTool: ./Examples/Simple/FitUserData_2D.py RefactoringTool: ./Examples/Simple/FitUserCustomizablePolynomial_2D.py RefactoringTool: ./Examples/Simple/FitOneNamedEquation_3D.py RefactoringTool: ./Examples/Simple/FitOneNamedEquation_2D.py RefactoringTool: ./Examples/Simple/EstimatedCoefficients_3D.py RefactoringTool: ./Examples/Simple/CreateExtendedVersionOfOneNamedEquation_2D.py RefactoringTool: ./Examples/Simple/CompareMultipleFittingAlgorithms_2D.py RefactoringTool: ./Examples/Simple/CoefficientBounds_2D.py RefactoringTool: ./Examples/Complex/ListAllStandardEquations_3D.py RefactoringTool: ./Examples/Complex/ListAllStandardEquations_2D.py RefactoringTool: ./Examples/Complex/ListAllExtendedVersionsOfEquations_3D.py RefactoringTool: ./Examples/Complex/ListAllExtendedVersionsOfEquations_2D.py RefactoringTool: ./Examples/Complex/FitUsingMultipleNonlinearSolvers_2D.py RefactoringTool: ./Examples/Complex/FitStatisticalDistributions.py RefactoringTool: ./Examples/Complex/FitAllEquationsInSeries_NoResultList_2D.py RefactoringTool: ./Examples/Complex/FitAllEquationsInSeries_LargeResultList_3D.py RefactoringTool: ./Examples/Complex/FitAllEquationsInSeries_LargeResultList_2D.py RefactoringTool: ./Examples/Complex/FitAllEquationsInParallel_NoResultList_2D.py RefactoringTool: ./Examples/Complex/FitAllEquationsInParallelUsingQueues_LargeResultList_2D.py RefactoringTool: ./DataCache/__init__.py RefactoringTool: ./DataCache/DataCacheFunctions.py RefactoringTool: ./DataCache/DataCache.py RefactoringTool: Warnings/messages while refactoring: RefactoringTool: ### In file ./Examples/Web/FlaskFit.py ### RefactoringTool: Line 10: absolute and local imports together classes # --- ./DataCache/DataCacheFunctions.py (original) +++ ./DataCache/DataCacheFunctions.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # --- ./DataCache/DataCache.py (original) +++ ./DataCache/DataCache.py (refactored) @@ -1,6 +1,6 @@ -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import + + + # pyeq2 is a collection of equations expressed as Python classes # @@ -97,7 +97,7 @@ returnCacheDataList = [] for dataCacheFunction in inModel.GetDataCacheFunctions(): # if this item is not in the inCacheDictionary, create it and add it to the inCacheDictionary - if not inCacheDictionary.has_key(dataCacheFunction[0]): + if dataCacheFunction[0] not in inCacheDictionary: # strip any numbers from the end of the string s = dataCacheFunction[0] # name, including any ending name info found = 1 @@ -138,7 +138,7 @@ self.reducedDataCacheDictionary = self.allDataCacheDictionary # if the reduced data cache does not yet have reduced raw data, generate it and add to the cache - if not self.reducedDataCacheDictionary.has_key('DependentData'): + if 'DependentData' not in self.reducedDataCacheDictionary: self.GenerateReducedRawData(inModel) return self.FindOrCreateCache_CommonCode(self.reducedDataCacheDictionary, inModel) + install -d /usr/src/tmp/python3-module-pyeq2-buildroot/usr/lib/python3/site-packages/pyeq2 + cp -fR DEDICATION.txt DataCache DesignAndDevelopment Examples ExtendedVersionHandlers IModel.py LICENSE.txt Model_2D_BaseClass.py Model_3D_BaseClass.py Models_2D Models_3D PolyFunctions.py README.txt Services UnitTests __init__.py /usr/src/tmp/python3-module-pyeq2-buildroot/usr/lib/python3/site-packages/pyeq2/ + /usr/lib/rpm/brp-alt Cleaning files in /usr/src/tmp/python3-module-pyeq2-buildroot (auto) Verifying and fixing files in /usr/src/tmp/python3-module-pyeq2-buildroot (binconfig,pkgconfig,libtool,desktop,gnuconfig) Checking contents of files in /usr/src/tmp/python3-module-pyeq2-buildroot/ (default) Compressing files in /usr/src/tmp/python3-module-pyeq2-buildroot (auto) Adjusting library links in /usr/src/tmp/python3-module-pyeq2-buildroot ./usr/lib: (from :0) Verifying ELF objects in /usr/src/tmp/python3-module-pyeq2-buildroot (arch=normal,fhs=normal,lfs=relaxed,lint=relaxed,rpath=normal,stack=normal,textrel=normal,unresolved=normal) Bytecompiling python modules in /usr/src/tmp/python3-module-pyeq2-buildroot using /usr/bin/python2.7 /usr/bin/python2.7: can't open file '/usr/lib/rpm/python.compileall.py': [Errno 2] No such file or directory error: Bad exit status from /usr/src/tmp/rpm-tmp.54898 (%install) RPM build errors: Bad exit status from /usr/src/tmp/rpm-tmp.54898 (%install) Command exited with non-zero status 1 44.17user 0.23system 0:45.20elapsed 98%CPU (0avgtext+0avgdata 48528maxresident)k 0inputs+0outputs (0major+62852minor)pagefaults 0swaps hsh-rebuild: rebuild of `python3-module-pyeq2-r243-alt2.src.rpm' failed. Command exited with non-zero status 1 50.42user 2.65system 0:53.62elapsed 98%CPU (0avgtext+0avgdata 110192maxresident)k 0inputs+0outputs (0major+403348minor)pagefaults 0swaps