Merge branch 'master' of gitlab.beuth-hochschule.de:s39174/temperaturverteilung

api/GetAverageData.py

@@ -4,7 +4,7 @@ import psycopg2
 from psycopg2 import sql
 
 cfg = configparser.ConfigParser()
-cfg.read('config.ini')
+cfg.read('../config.ini')
 assert "POSTGRES" in cfg, "missing POSTGRES in config.ini"
 assert "INTERPOLATION" in cfg, "missing INTERPOLATION in config.ini"
 param_postgres = cfg["POSTGRES"]

api/api.py

@@ -5,7 +5,7 @@ import configparser
 from GetAverageData import get_interpolation_data_for_point
 
 cfg = configparser.ConfigParser()
-cfg.read('config.ini')
+cfg.read('../config.ini')
 assert "POSTGRES" in cfg, "missing POSTGRES in config.ini"
 param_postgres = cfg["POSTGRES"]
 

dataacquisition/ExportToDatabase.py

@@ -16,7 +16,7 @@ import configparser
 from api.GetAverageData import get_interpolation_data_for_point
 
 cfg = configparser.ConfigParser()
-cfg.read('config.ini')
+cfg.read('../config.ini')
 assert "POSTGRES" in cfg, "missing POSTGRES in config.ini"
 param_postgres = cfg["POSTGRES"]
 param_interpol = cfg["INTERPOLATION"]

dataacquisition/config.ini

-[POSTGRES]
-host = localhost
-port = 5432
-user = postgres
-password = postgres
-dbName = temperatures_berteld_morstein
-
-[INTERPOLATION]
-; neighbouring measurements used for interpolation
-amount_neighbours = 5
-; in km. 25km or 10km possible
-matrix_density = 25
\ No newline at end of file

dataacquisition/test_ExportToDatabase.py

@@ -14,7 +14,7 @@ import psycopg2
 import time
 
 cfg = configparser.ConfigParser()
-cfg.read('config.ini')
+cfg.read('../config.ini')
 
 assert "POSTGRES" in cfg, "missing POSTGRES in config.ini"