Refactoring, fin du lever/coucher de soleil, et début de sentinelles

[predictops.git] / predictops / target / target.py

diff --git a/predictops/target/target.py b/predictops/target/target.py
index 9e3d86d31de82f24ad8a8c2bd6abf6e742f446fe..fdff54ba2259aef28f13964f71b8e115f826622b 100644 (file)
--- a/predictops/target/target.py
+++ b/predictops/target/target.py
@@ -11,8 +11,8 @@ logger = getLogger()
 
 class Target:
 
 
 class Target:
 

-    def __init__(self, config_file = None,
-                 start = None, end = None, timestep = None, cumulative = None):
+    def __init__(self, config_file=None,
+                 start=None, end=None, timestep=None, cumulative=None):

 
         self._config = ConfigParser()
         self._config.read(config_file)
 
         self._config = ConfigParser()
         self._config.read(config_file)


@@ -33,8 +33,6 @@ class Target:
         self._stream_file = eval(self._config['DATA']['csv_file'])
         self._get_located_interventions()
 
         self._stream_file = eval(self._config['DATA']['csv_file'])
         self._get_located_interventions()
 

-
-

     @property
     def start(self):
         return self._start
     @property
     def start(self):
         return self._start


@@ -43,7 +41,6 @@ class Target:
     def start(self, x):
         self._start = x
 
     def start(self, x):
         self._start = x
 

-

     @property
     def end(self):
         return self._end
     @property
     def end(self):
         return self._end


@@ -52,7 +49,6 @@ class Target:
     def end(self, x):
         self._end = x
 
     def end(self, x):
         self._end = x
 

-

     @property
     def y(self):
         return self._y
     @property
     def y(self):
         return self._y


@@ -61,8 +57,6 @@ class Target:
     def end(self, y):
         self._y = y
 
     def end(self, y):
         self._y = y
 

-
-

     def _get_located_interventions(self):
         if not self._config['SPECIFICATION'].getboolean('origin')\
            and not self._config['SPECIFICATION'].getboolean('destination'):
     def _get_located_interventions(self):
         if not self._config['SPECIFICATION'].getboolean('origin')\
            and not self._config['SPECIFICATION'].getboolean('destination'):