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

[predictops.git] / main.py

diff --git a/main.py b/main.py
index d1d7f9c24721819d8e9d0a39eb50a1eb52546e47..d451534d130211ace744abc93379b9be5c7de0ef 100644 (file)
--- a/main.py
+++ b/main.py
@@ -1,5 +1,4 @@
 from predictops.engine import Engine
 from predictops.engine import Engine

-from predictops.learn.preprocessing import Preprocessing

 
 from logging import getLogger
 from logging.config import fileConfig
 
 from logging import getLogger
 from logging.config import fileConfig


@@ -12,15 +11,11 @@ logger = getLogger()
 if __name__ == '__main__':
 
     config = (Path.cwd() / 'config') / 'learn.cfg'
 if __name__ == '__main__':
 
     config = (Path.cwd() / 'config') / 'learn.cfg'

-    engine = Engine(config_file = config)
-
-    engine.add_features()
-    engine.add_target()
-
-    process = Preprocessing(config_file = config, dict_features = engine.X)
-
-    print(process.dataframe.head(n=20))
-    print(process.dataframe.tail(n=20))
+    with Engine(config_file = config) as e:
+        e.add_features()
+        e.add_target()
+        e.add_preprocessing()
+        e.learn()

 
     '''target = toarea(stream_file = Path.cwd() / 'data' / 'targets' / 'sdis25' / 'interventions.csv')
 
 
     '''target = toarea(stream_file = Path.cwd() / 'data' / 'targets' / 'sdis25' / 'interventions.csv')