1
0

4 کامیت‌ها 23bb66d17a ... 428cd0f1ae

نویسنده SHA1 پیام تاریخ
  David 428cd0f1ae Merge branch 'dev_awg' into dev_david 1 هفته پیش
  anweiguo cad9e84f5b 1.修改获取hive时刻与修改曦谋特征字段wd10 1 هفته پیش
  David 2832c58ee0 06171557 1 هفته پیش
  liudawei 0912c5478a Merge branch 'dev_david' of anweiguo/algorithm_platform into dev_awg 1 هفته پیش
3فایلهای تغییر یافته به همراه12 افزوده شده و 6 حذف شده
  1. 2 2
      common/database.toml
  2. 8 4
      common/database_dml.py
  3. 2 0
      run_all.py

+ 2 - 2
common/database.toml

@@ -8,8 +8,8 @@ password = ""
 jar_file = 'jar/hive-jdbc-standalone.jar'
 
 [xmo]
-features = ['stationCode', 'date_time', 'forecastDatatime', 'rh',  'wd80', 'ws10', 'ws80', 'dniCalcd','rain', 'dewPoint2m', 'snowfall', 'windDirection10m', 'precipitation',
+features = ['stationCode', 'date_time', 'forecastDatatime', 'rh',  'wd80', 'ws10', 'ws80', 'dniCalcd','rain', 'dewPoint2m', 'snowfall', 'wd10', 'precipitation',
            'apparentTemperature', 'weatherCode', 'sunshineDuration','shortwaveRadiation', 'directRadiation', 'diffuseRadiation','globalTiltedIrradiance', 'terrestrialRadiation']
 
-numeric_features = ['rh',  'wd80', 'ws10', 'ws80', 'dniCalcd','rain', 'dewPoint2m', 'snowfall', 'windDirection10m', 'precipitation',
+numeric_features = ['rh',  'wd80', 'ws10', 'ws80', 'dniCalcd','rain', 'dewPoint2m', 'snowfall', 'wd10', 'precipitation',
            'apparentTemperature', 'weatherCode', 'sunshineDuration','shortwaveRadiation', 'directRadiation', 'diffuseRadiation','globalTiltedIrradiance', 'terrestrialRadiation']

+ 8 - 4
common/database_dml.py

@@ -754,14 +754,18 @@ def get_xmo_data_from_hive(args):
             moment = args['moment']
         else:
             hour = datetime.strptime(args['current_date'], "%Y%m%d%H").hour
-            if hour < 3:
+            if hour < 4:
                 moment = '00'
-            elif hour < 6:
+            elif hour < 7:
                 moment = '03'
-            elif hour < 15:
+            elif hour < 10:
+                moment = '06'
+            elif hour < 13:
                 moment = '09'
-            elif hour < 19:
+            elif hour < 16:
                 moment = '12'
+            elif hour < 19:
+                moment = '15'
             else:
                 moment = '18'
             print(moment)

+ 2 - 0
run_all.py

@@ -32,6 +32,8 @@ services = [
     ("models_processing/model_tf/tf_lstm3_train.py", 10121),
     ("models_processing/model_tf/tf_lstm_zone_pre.py", 10125),
     ("models_processing/model_tf/tf_lstm_zone_train.py", 10124),
+    ("models_processing/model_tf/tf_transformer_pre.py", 10132),
+    ("models_processing/model_tf/tf_transformer_train.py", 10131),
 
     ("post_processing/post_processing.py", 10098),
     ("evaluation_processing/analysis.py", 10099),