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 9e35b2da9acf12c39b784454a8c420dae5ce2bb4..d451534d130211ace744abc93379b9be5c7de0ef 100644 (file)
--- a/main.py
+++ b/main.py
@@ -1,13 +1,9 @@
 from predictops.engine import Engine
 from predictops.engine import Engine

-from predictops.learn.preprocessing import Preprocessing
-from predictops.target.all import All
-from predictops.target.toarea import ToArea

 
 from logging import getLogger
 from logging.config import fileConfig
 from pathlib import Path
 
 
 from logging import getLogger
 from logging.config import fileConfig
 from pathlib import Path
 

-import geopandas as gpd

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


@@ -15,27 +11,17 @@ 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)
+    with Engine(config_file = config) as e:
+        e.add_features()
+        e.add_target()
+        e.add_preprocessing()
+        e.learn()

 
 

-    engine.add_features()
-    #print(engine.X)
-    process = Preprocessing(config_file = config, dict_features = engine.X)
-
-
-    #print(engine.X[datetime.strptime('06/30/2010 21:00:00', '%m/%d/%Y %H:%M:%S')])
-    print(process.dataframe.head(n=20))
-    print(process.dataframe.tail(n=20))
-
-
-    target = All(stream_file = Path.cwd() / 'data' / 'targets' / 'sdis25' / 'interventions.csv')
-
-
-    exit()
+    '''target = toarea(stream_file = Path.cwd() / 'data' / 'targets' / 'sdis25' / 'interventions.csv')

 
     depts = gpd.read_file( Path.cwd() / 'data' / 'targets' / 'departments' / "departements-20180101.shp")
     Doubs = depts.loc[depts['nom'] == 'Doubs'].iloc[0]
 
     ToArea(area=Doubs.geometry,
 
     depts = gpd.read_file( Path.cwd() / 'data' / 'targets' / 'departments' / "departements-20180101.shp")
     Doubs = depts.loc[depts['nom'] == 'Doubs'].iloc[0]
 
     ToArea(area=Doubs.geometry,

-           start = start, end = end,

            csv_file = Path.cwd() / 'data' / 'targets' / 'sdis25' / 'interventions.csv')
            csv_file = Path.cwd() / 'data' / 'targets' / 'sdis25' / 'interventions.csv')

-
+    '''