X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/predictops.git/blobdiff_plain/4b6d71d96bb92791cc31640e5f30378ae6fe63e4..a2faba3f0797b7be72d0c8fa9cb9db67456136d6:/predictops/source/ephemeris.py

diff --git a/predictops/source/ephemeris.py b/predictops/source/ephemeris.py
index 2a34364..e1c07ec 100644
--- a/predictops/source/ephemeris.py
+++ b/predictops/source/ephemeris.py
@@ -1,14 +1,14 @@
-from .source import Source
-
 from configparser import ConfigParser
-from csv import DictReader
 from datetime import datetime, timedelta
+from logging import getLogger
+from logging.config import fileConfig
 from pathlib import Path
 
 import time
 import calendar
 
-CSV_FILE = Path.cwd() / 'config' / 'features' / 'ephemeris_features.csv'
+fileConfig((Path.cwd() / 'config') / 'logging.cfg')
+logger = getLogger()
 
 class Ephemeris:
 
@@ -17,17 +17,13 @@ class Ephemeris:
 
     def __init__(self, config_file):
 
-        # Check for the integrity of feature names
-        Source.__init__(self)
-
         self._config = ConfigParser()
         self._config.read(config_file)
 
         # Collecting ephemeris features
-        with open(CSV_FILE, "r") as f:
-            reader = DictReader(f, delimiter=',')
-            self._features = [row['name'] for row in reader
-                              if self._config['FEATURES'].getboolean(row['name'])]
+        self._features = [section for section in self._config
+                              if self._config[section].getboolean('numerical')
+                              or self._config[section].getboolean('categorical')]
 
         self._dated_features = {}
 
@@ -50,10 +46,10 @@ class Ephemeris:
         self._end = x
 
 
-
     @property
     def dated_features(self):
         if self._dated_features == {}:
+            logger.info("Adding ephemeris features")
             date = self._start
             while date <= self._end:
                 dict_hour = {}