Adding calendar features

[predictops.git] / main.py

diff --git a/main.py b/main.py
index 3e31d16336be3e942be06424fc38c9ef114e3e4d..6733216b474c45a136766be52e83ed3e3a0591e7 100644 (file)
--- a/main.py
+++ b/main.py
@@ -1,24 +1,22 @@
-from lib.source import MeteoFrance
+from lib.source.ephemeris import Ephemeris
+from lib.source.meteofrance import MeteoFrance

 
 

-from configparser import ConfigParser
-from logging.config import fileConfig
+from datetime import datetime

 from logging import getLogger
 from logging import getLogger

+from logging.config import fileConfig

 from pathlib import Path
 from shutil import rmtree
 from pathlib import Path
 from shutil import rmtree

-from subprocess import Popen, PIPE
-

 
 fileConfig((Path.cwd() / 'config') / 'logging.cfg')
 logger = getLogger()
 
 
 class Engine:
 
 fileConfig((Path.cwd() / 'config') / 'logging.cfg')
 logger = getLogger()
 
 
 class Engine:

-    def __init__(self, clean = False):
+    def __init__(self, start = None, end = None, time_step = None):

         logger.info("Predictops engine launched")
         logger.info("Predictops engine launched")

-        if clean:
-            self.clean()
-            print("Ne pas oublier d'exporter la BDD dans pgModeler")
-            print("Ni de copier l'archive dans la data")
+        self._X = {}
+        self._Y = {}
+

 
     def clean(self):
         # Cleaning the data directory
 
     def clean(self):
         # Cleaning the data directory


@@ -29,31 +27,43 @@ class Engine:
         p = Path(Path.cwd() / 'data')
         p.mkdir()
 
         p = Path(Path.cwd() / 'data')
         p.mkdir()
 

-        # Cleaning the postgresql database
-        config = ConfigParser()
-        config.read((Path.cwd() / 'config') / 'main.cfg')

 
 

-        host   = config['postgresql']['host']
-        user   = config['postgresql']['user']
-        port   = config['postgresql']['port']
-        dbname = config['postgresql']['dbname']
+    def add_feature(self, name, **kw):
+
+        if name == 'meteofrance':
+            meteofeature = MeteoFrance(**kw)
+            meteofeature.update()
+            dated_features = meteofeature.dated_features
+            for date in dated_features:
+                self._X.setdefault(date,{}).update(dated_features[date])
+        elif name == 'ephemeris':
+            ephemerides = Ephemeris(**kw)
+            dated_features = ephemerides.dated_features
+            for date in dated_features:
+                self._X.setdefault(date,{}).update(dated_features[date])
+
+
+    @property
+    def X(self):
+        return self._X

 
 

-        logger.info("PostgreSQL database deletion")
-        command = ['dropdb', '-h', host, '-U', user, '-p', port, dbname]
-        process = Popen(command, stdout=PIPE, stderr=PIPE)
-        process.communicate()
+    @X.setter
+    def X(self, x):
+        self._X = x

 
 

-        logger.info("PostgreSQL database creation")
-        command = ['createdb', '-h', host, '-U', user, '-p', port, dbname]
-        process = Popen(command, stdout=PIPE, stderr=PIPE)
-        process.communicate()

 
 

-    def add_meteofrance(self):
-        self.meteofrance = MeteoFrance()
+start = datetime.strptime('01/01/2010 00:00:00', '%m/%d/%Y %H:%M:%S')
+end = datetime.strptime('12/31/2010 23:00:00', '%m/%d/%Y %H:%M:%S')

 
 

+engine = Engine()
+engine.add_feature(name = 'meteofrance',
+                   start = start, end = end,
+                   latitude = 47.25, longitude = 6.0333, nb_stations = 3,
+                   features = ['temperature', 'pressure'])

 
 

+engine.add_feature(name = 'ephemeris',
+                   start = start, end = end,
+                   features = ['hour', 'dayInWeek', 'dayInMonth', 'dayInYear',
+                               'weekInYear', 'month', 'year'])

 
 

-engine = Engine(clean = False)
-engine.add_meteofrance()
-engine.meteofrance.update()
-print(len(engine.meteofrance.dated_features))
\ No newline at end of file
+print(engine.X)
\ No newline at end of file