branch is running again… now the reintegration should start

T-002 · Mar 15, 2013 · e26f812 · e26f812
1 parent b72f9c1
commit e26f812
Show file tree

Hide file tree

Showing 7 changed files with 190 additions and 292 deletions.
diff --git a/pycast/common/__init__.py b/pycast/common/__init__.py
@@ -27,16 +27,4 @@
 from timeseries import TimeSeries, MultiDimensionalTimeSeries
 from profileme import profileMe
 from pycastobject import PyCastObject
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-#from matrix import Matrix, Vector
-=======
-from matrix import Matrix, Vector
->>>>>>> Stashed changes
-=======
-from matrix import Matrix, Vector
->>>>>>> Stashed changes
-=======
-from matrix import Matrix, Vector
->>>>>>> Stashed changes
+#from matrix import Matrix, Vector
diff --git a/pycast/common/timeseries.py b/pycast/common/timeseries.py
@@ -186,7 +186,7 @@ def from_twodim_list(cls, datalist, format=None):
             ts.add_entry(*entry[:2])
 
         ## set the normalization level
-        ts._normalized = ts.check_normalization()
+        ts._normalized = ts._check_normalization()
         ts.sort_timeseries()  
 
         return ts
@@ -215,7 +215,7 @@ def initialize_from_sql_cursor(self, sqlcursor):
             data = sqlcursor.fetchmany()
 
         ## set the normalization level
-        self._normalized = self.check_normalization
+        self._normalized = self._check_normalization
 
         ## return the number of tuples added to the timeseries.
         return tuples
@@ -535,7 +535,7 @@ def is_normalized(self):
         """
         return self._normalized
 
-    def check_normalization(self):
+    def _check_normalization(self):
         """Checks, if the TimeSeries is normalized.
 
         :return:    Returns :py:const:`True` if all data entries of the TimeSeries have an equal temporal
@@ -836,19 +836,7 @@ def initialize_from_sql_cursor(self, sqlcursor):
             data = sqlcursor.fetchmany()
 
         ## set the normalization level
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
         self._normalized = self._check_normalization()
-=======
-        self._normalized = self._check_normalization
->>>>>>> Stashed changes
-=======
-        self._normalized = self._check_normalization
->>>>>>> Stashed changes
-=======
-        self._normalized = self._check_normalization
->>>>>>> Stashed changes
 
         ## return the number of tuples added to the timeseries.
         return tuples

diff --git a/pycast/errors/__init__.py b/pycast/errors/__init__.py
@@ -27,12 +27,12 @@
 from meansquarederror                     import MeanSquaredError, MSE
 from symmetricmeanabsolutepercentageerror import SymmetricMeanAbsolutePercentageError, SMAPE
 from meanabsolutedeviationerror           import MeanAbsoluteDeviationError, MAD
-from meaneconomicerror           import MeanEconomicError, MEE, MeanSignedEconomicError, MSEE
+#from meaneconomicerror           import MeanEconomicError, MEE, MeanSignedEconomicError, MSEE
 
 from meanabsolutepercentageerror import MeanAbsolutePercentageError, MAPE, GeometricMeanAbsolutePercentageError, GMAPE, MeanSignedPercentageError, MSPE
-from weightedmeanabsolutepercentageerror import WeightedMeanAbsolutePercentageError, WMAPE
+#from weightedmeanabsolutepercentageerror import WeightedMeanAbsolutePercentageError, WMAPE
 from medianabsolutepercentageerror import MedianAbsolutePercentageError, MdAPE
 
-from meanabsolutescalederror     import MeanAbsoluteScaledError, MASE
+#from meanabsolutescalederror     import MeanAbsoluteScaledError, MASE
 
-from meansigneddifferenceerror import MeanSignedDifferenceError, MSD
+#from meansigneddifferenceerror import MeanSignedDifferenceError, MSD
diff --git a/pycast/methods/__init__.py b/pycast/methods/__init__.py
@@ -26,16 +26,4 @@
 
 from simplemovingaverage  import SimpleMovingAverage
 from exponentialsmoothing import ExponentialSmoothing, HoltMethod, HoltWintersMethod
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-#from regression import Regression, LinearRegression
-=======
-from regression import Regression, LinearRegression
->>>>>>> Stashed changes
-=======
-from regression import Regression, LinearRegression
->>>>>>> Stashed changes
-=======
-from regression import Regression, LinearRegression
->>>>>>> Stashed changes
+#from regression import Regression, LinearRegression
diff --git a/pycast/tests/__init__.py b/pycast/tests/__init__.py
@@ -36,13 +36,13 @@
 
 ## method tests
 from methodtest import BaseMethodTest, BaseForecastingMethodTest, SimpleMovingAverageTest, ExponentialSmoothingTest, HoltMethodTest, HoltWintersMethodTest
-from regressiontest import RegressionTest, LinearRegressionTest
+#from regressiontest import RegressionTest, LinearRegressionTest
 
 ## error measure tests
-from errormeasuretest import BaseErrorMeasureTest, MeanSquaredErrorTest, SymmetricMeanAbsolutePercentageErrorTest, MeanAbsoluteDeviationErrorTest, MeanAbsoluteScaledErrorTest, MedianAbsolutePercentageErrorTest, MeanSignedDifferenceErrorTest
+from errormeasuretest import BaseErrorMeasureTest, MeanSquaredErrorTest, SymmetricMeanAbsolutePercentageErrorTest, MeanAbsoluteDeviationErrorTest, MedianAbsolutePercentageErrorTest#, MeanAbsoluteScaledErrorTest#, MeanSignedDifferenceErrorTest
 from mapetest import MeanAbsolutePercentageErrorTest, GeometricMeanAbsolutePercentageErrorTest
-from weightedmapetest import WeightedMeanAbsolutePercentageErrorTest
-from meetest import MeanEconomicErrorTest
+#from weightedmapetest import WeightedMeanAbsolutePercentageErrorTest
+#from meetest import MeanEconomicErrorTest
 
 ## optimization method
 from baseoptimizationtest import BaseOptimizationMethodTest
@@ -52,4 +52,4 @@
 from decoratorstest import OptimizedDecoratorTest
 
 # matrix test
-from matrixtest import MatrixTest, VectorTest, MatrixHelperTest
+#from matrixtest import MatrixTest, VectorTest, MatrixHelperTest