...

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

Hide file tree

Showing 4 changed files with 18 additions and 0 deletions.
diff --git a/pycast/common/__init__.py b/pycast/common/__init__.py
@@ -29,10 +29,14 @@
 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
diff --git a/pycast/common/timeseries.py b/pycast/common/timeseries.py
@@ -837,11 +837,15 @@ def initialize_from_sql_cursor(self, sqlcursor):
 
         ## 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

diff --git a/pycast/methods/__init__.py b/pycast/methods/__init__.py
@@ -28,10 +28,14 @@
 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
diff --git a/pycast/tests/timeseriesmiscellaneoustest.py b/pycast/tests/timeseriesmiscellaneoustest.py
@@ -28,6 +28,7 @@
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 import unittest, re, os
 =======
 =======
@@ -38,6 +39,8 @@
 >>>>>>> Stashed changes
 =======
 >>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 import unittest, re, os, random
 >>>>>>> Stashed changes
 from copy import copy
@@ -119,6 +122,7 @@ def validity_of___str___test(self):
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 #   def json_serialization_formatfree_test(self):
 #       """Test the json serialialization without predefined format."""
 #       tsOrg = TimeSeries()
@@ -159,6 +163,8 @@ def validity_of___str___test(self):
 =======
 >>>>>>> Stashed changes
 =======
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
     def list_initialization_test(self):
         """Test TimeSeries initialization from a given list."""