David 1 månad sedan
förälder
incheckning
5b00c5e0b2

+ 2 - 0
.gitignore

@@ -4,5 +4,7 @@
 *.xlsx
 ipynb_checkpoints/**
 **/__pycache__/
+*.py[cod]
+*$py.class
 *.zip
 **/.ipynb_checkpoints/

+ 1 - 1
.idea/algorithm_platform.iml

@@ -2,7 +2,7 @@
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="py37tf115" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="py312" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="PyDocumentationSettings">

+ 1 - 1
.idea/misc.xml

@@ -3,5 +3,5 @@
   <component name="Black">
     <option name="sdkName" value="D:\anaconda3" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="py37tf115" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="py312" project-jdk-type="Python SDK" />
 </project>

+ 153 - 96
.idea/workspace.xml

@@ -5,10 +5,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="03b32494-2264-4bfc-811a-22f732290233" name="更改" comment="">
-      <change beforePath="$PROJECT_DIR$/common/database_dml.py" beforeDir="false" afterPath="$PROJECT_DIR$/common/database_dml.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/data_processing/data_operation/data_handler.py" beforeDir="false" afterPath="$PROJECT_DIR$/data_processing/data_operation/data_handler.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/models_processing/model_koi/bp.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/models_processing/model_koi/bp.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/models_processing/model_koi/nn_bp.py" beforeDir="false" afterPath="$PROJECT_DIR$/models_processing/model_koi/nn_bp.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/models_processing/model_koi/tf_bp_pre.py" beforeDir="false" afterPath="$PROJECT_DIR$/models_processing/model_koi/tf_bp_pre.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/models_processing/model_koi/tf_cnn_pre.py" beforeDir="false" afterPath="$PROJECT_DIR$/models_processing/model_koi/tf_cnn_pre.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/models_processing/model_koi/tf_lstm_pre.py" beforeDir="false" afterPath="$PROJECT_DIR$/models_processing/model_koi/tf_lstm_pre.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -35,25 +36,36 @@
   </component>
   <component name="PropertiesComponent"><![CDATA[{
   "keyToString": {
+    "Python.analysis_cdq.executor": "Run",
     "Python.data_nwp_ftp.executor": "Run",
     "Python.logs.executor": "Debug",
     "Python.nn_bp.executor": "Debug",
     "Python.pre_data_ftp.executor": "Debug",
+    "Python.pre_prod_ftp.executor": "Run",
     "Python.run_all.executor": "Run",
+    "Python.test (1).executor": "Debug",
+    "Python.test (2).executor": "Run",
     "Python.test.executor": "Debug",
+    "Python.tf_bp.executor": "Run",
+    "Python.tf_bp_pre.executor": "Run",
+    "Python.tf_bp_train.executor": "Run",
+    "Python.tf_cnn_pre.executor": "Debug",
+    "Python.tf_cnn_train (1).executor": "Run",
+    "Python.tf_lstm_pre.executor": "Debug",
+    "Python.tf_lstm_train.executor": "Run",
     "RunOnceActivity.ShowReadmeOnStart": "true",
     "git-widget-placeholder": "dev__david",
-    "last_opened_file_path": "E:/treasure/ipfcst-forecast-wind3-tf1",
+    "last_opened_file_path": "E:/algorithm_platform",
     "settings.editor.selected.configurable": "com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable"
   }
 }]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
-      <recent name="E:\algorithm_platform\models_processing\model_koi" />
       <recent name="E:\algorithm_platform\common" />
+      <recent name="E:\algorithm_platform\models_processing\model_koi" />
+      <recent name="E:\algorithm_platform\evaluation_processing" />
       <recent name="E:\algorithm_platform\models_processing\losses" />
       <recent name="E:\algorithm_platform\pre_evaluation" />
-      <recent name="E:\algorithm_platform\evaluation" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="E:\algorithm_platform\data_processing\data_operation" />
@@ -63,8 +75,8 @@
       <recent name="E:\algorithm_platform\data_processing\processing_limit_power" />
     </key>
   </component>
-  <component name="RunManager" selected="Python.nn_bp">
-    <configuration name="data_nwp_ftp" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+  <component name="RunManager" selected="Python.tf_lstm_pre">
+    <configuration name="tf_bp_pre" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="algorithm_platform" />
       <option name="ENV_FILES" value="" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -73,11 +85,11 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/data_processing/data_operation" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/models_processing/model_koi" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/data_processing/data_operation/data_nwp_ftp.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/models_processing/model_koi/tf_bp_pre.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -86,7 +98,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="nn_bp" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+    <configuration name="tf_cnn_pre" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="algorithm_platform" />
       <option name="ENV_FILES" value="" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -99,7 +111,7 @@
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/models_processing/model_koi/nn_bp.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/models_processing/model_koi/tf_cnn_pre.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -108,7 +120,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="pre_data_ftp" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+    <configuration name="tf_cnn_train (1)" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="algorithm_platform" />
       <option name="ENV_FILES" value="" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -117,11 +129,11 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/data_processing/data_operation" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/models_processing/model_koi" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/data_processing/data_operation/pre_data_ftp.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/models_processing/model_koi/tf_cnn_train.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -130,7 +142,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="run_all" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+    <configuration name="tf_lstm_pre" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="algorithm_platform" />
       <option name="ENV_FILES" value="" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -139,11 +151,11 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/models_processing/model_koi" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/run_all.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/models_processing/model_koi/tf_lstm_pre.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -152,7 +164,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="test" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+    <configuration name="tf_lstm_train" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="algorithm_platform" />
       <option name="ENV_FILES" value="" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -165,7 +177,7 @@
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/models_processing/model_koi/test.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/models_processing/model_koi/tf_lstm_train.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -176,11 +188,11 @@
     </configuration>
     <recent_temporary>
       <list>
-        <item itemvalue="Python.nn_bp" />
-        <item itemvalue="Python.test" />
-        <item itemvalue="Python.pre_data_ftp" />
-        <item itemvalue="Python.data_nwp_ftp" />
-        <item itemvalue="Python.run_all" />
+        <item itemvalue="Python.tf_lstm_pre" />
+        <item itemvalue="Python.tf_cnn_pre" />
+        <item itemvalue="Python.tf_lstm_train" />
+        <item itemvalue="Python.tf_cnn_train (1)" />
+        <item itemvalue="Python.tf_bp_pre" />
       </list>
     </recent_temporary>
   </component>
@@ -207,133 +219,178 @@
       <breakpoints>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/data_processing/data_operation/data_nwp_ftp.py</url>
-          <line>117</line>
-          <option name="timeStamp" value="105" />
+          <line>164</line>
+          <option name="timeStamp" value="116" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/data_processing/data_operation/data_nwp_ftp.py</url>
-          <line>131</line>
-          <option name="timeStamp" value="106" />
+          <line>159</line>
+          <option name="timeStamp" value="119" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/data_processing/data_operation/data_nwp_ftp.py</url>
-          <line>134</line>
-          <option name="timeStamp" value="108" />
+          <line>161</line>
+          <option name="timeStamp" value="120" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/data_processing/data_operation/data_nwp_ftp.py</url>
-          <line>137</line>
-          <option name="timeStamp" value="109" />
+          <line>162</line>
+          <option name="timeStamp" value="121" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/data_processing/data_operation/data_nwp_ftp.py</url>
-          <line>135</line>
-          <option name="timeStamp" value="111" />
+          <line>181</line>
+          <option name="timeStamp" value="123" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/data_processing/data_operation/data_nwp_ftp.py</url>
-          <line>144</line>
-          <option name="timeStamp" value="112" />
+          <url>file://$PROJECT_DIR$/evaluation_processing/analysis_cdq.py</url>
+          <line>312</line>
+          <option name="timeStamp" value="138" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/data_processing/data_operation/data_nwp_ftp.py</url>
+          <url>file://$PROJECT_DIR$/data_processing/data_operation/data_handler.py</url>
+          <line>36</line>
+          <option name="timeStamp" value="152" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/data_processing/data_operation/data_handler.py</url>
+          <line>30</line>
+          <option name="timeStamp" value="153" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/data_processing/data_operation/data_handler.py</url>
+          <line>200</line>
+          <option name="timeStamp" value="177" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/data_processing/data_operation/data_handler.py</url>
+          <line>188</line>
+          <option name="timeStamp" value="178" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/data_processing/data_operation/data_handler.py</url>
+          <line>211</line>
+          <option name="timeStamp" value="191" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/data_processing/data_operation/data_handler.py</url>
           <line>145</line>
-          <option name="timeStamp" value="113" />
+          <option name="timeStamp" value="193" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/data_processing/data_operation/data_nwp_ftp.py</url>
-          <line>146</line>
-          <option name="timeStamp" value="114" />
+          <url>file://$PROJECT_DIR$/data_processing/data_operation/data_handler.py</url>
+          <line>158</line>
+          <option name="timeStamp" value="194" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/data_processing/data_operation/data_nwp_ftp.py</url>
-          <line>171</line>
-          <option name="timeStamp" value="115" />
+          <url>file://$PROJECT_DIR$/models_processing/model_koi/tf_bp.py</url>
+          <line>42</line>
+          <option name="timeStamp" value="195" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/data_processing/data_operation/data_nwp_ftp.py</url>
-          <line>164</line>
-          <option name="timeStamp" value="116" />
+          <url>file://$PROJECT_DIR$/models_processing/model_koi/tf_bp.py</url>
+          <line>58</line>
+          <option name="timeStamp" value="196" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/data_processing/data_operation/data_nwp_ftp.py</url>
-          <line>167</line>
-          <option name="timeStamp" value="117" />
+          <url>file://$PROJECT_DIR$/models_processing/model_koi/tf_bp.py</url>
+          <line>52</line>
+          <option name="timeStamp" value="197" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/data_processing/data_operation/data_nwp_ftp.py</url>
-          <line>159</line>
-          <option name="timeStamp" value="119" />
+          <url>file://$PROJECT_DIR$/models_processing/model_koi/tf_bp.py</url>
+          <line>48</line>
+          <option name="timeStamp" value="198" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/data_processing/data_operation/data_nwp_ftp.py</url>
-          <line>161</line>
-          <option name="timeStamp" value="120" />
+          <url>file://$PROJECT_DIR$/models_processing/model_koi/tf_bp.py</url>
+          <line>60</line>
+          <option name="timeStamp" value="201" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/data_processing/data_operation/data_nwp_ftp.py</url>
-          <line>162</line>
-          <option name="timeStamp" value="121" />
+          <url>file://$PROJECT_DIR$/models_processing/model_koi/tf_bp.py</url>
+          <line>64</line>
+          <option name="timeStamp" value="202" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/data_processing/data_operation/data_nwp_ftp.py</url>
-          <line>166</line>
-          <option name="timeStamp" value="122" />
+          <url>file://$PROJECT_DIR$/data_processing/data_operation/data_handler.py</url>
+          <line>208</line>
+          <option name="timeStamp" value="203" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/data_processing/data_operation/data_nwp_ftp.py</url>
-          <line>181</line>
-          <option name="timeStamp" value="123" />
+          <line>172</line>
+          <option name="timeStamp" value="211" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/common/database_dml_koi.py</url>
+          <line>375</line>
+          <option name="timeStamp" value="212" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/models_processing/model_koi/nn_bp.py</url>
-          <line>226</line>
-          <option name="timeStamp" value="126" />
+          <url>file://$PROJECT_DIR$/common/database_dml_koi.py</url>
+          <line>373</line>
+          <option name="timeStamp" value="213" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/models_processing/model_koi/nn_bp.py</url>
-          <line>227</line>
-          <option name="timeStamp" value="127" />
+          <url>file://$PROJECT_DIR$/common/database_dml_koi.py</url>
+          <line>378</line>
+          <option name="timeStamp" value="214" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/models_processing/model_koi/nn_bp.py</url>
-          <line>228</line>
-          <option name="timeStamp" value="128" />
+          <url>file://$PROJECT_DIR$/common/database_dml_koi.py</url>
+          <line>379</line>
+          <option name="timeStamp" value="215" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/models_processing/model_koi/nn_bp.py</url>
-          <line>230</line>
-          <option name="timeStamp" value="129" />
+          <url>file://$PROJECT_DIR$/models_processing/model_koi/tf_cnn_train.py</url>
+          <line>6</line>
+          <option name="timeStamp" value="216" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/models_processing/model_koi/nn_bp.py</url>
-          <line>232</line>
-          <option name="timeStamp" value="130" />
+          <url>file://$PROJECT_DIR$/models_processing/model_koi/tf_lstm_pre.py</url>
+          <line>63</line>
+          <option name="timeStamp" value="223" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/models_processing/model_koi/nn_bp.py</url>
-          <line>233</line>
-          <option name="timeStamp" value="131" />
+          <url>file://$PROJECT_DIR$/models_processing/model_koi/tf_cnn_pre.py</url>
+          <line>55</line>
+          <option name="timeStamp" value="224" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/models_processing/model_koi/nn_bp.py</url>
+          <url>file://$PROJECT_DIR$/data_processing/data_operation/data_handler.py</url>
           <line>234</line>
-          <option name="timeStamp" value="132" />
+          <option name="timeStamp" value="225" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/models_processing/model_koi/tf_lstm_pre.py</url>
+          <line>62</line>
+          <option name="timeStamp" value="226" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/models_processing/model_koi/tf_lstm_pre.py</url>
+          <line>64</line>
+          <option name="timeStamp" value="227" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/models_processing/model_koi/tf_lstm_pre.py</url>
+          <line>66</line>
+          <option name="timeStamp" value="228" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/models_processing/model_koi/nn_bp.py</url>
-          <line>235</line>
-          <option name="timeStamp" value="133" />
+          <url>file://$PROJECT_DIR$/models_processing/model_koi/tf_lstm_pre.py</url>
+          <line>67</line>
+          <option name="timeStamp" value="229" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/models_processing/model_koi/nn_bp.py</url>
-          <line>236</line>
-          <option name="timeStamp" value="134" />
+          <url>file://$PROJECT_DIR$/models_processing/model_koi/tf_lstm_pre.py</url>
+          <line>68</line>
+          <option name="timeStamp" value="230" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/models_processing/model_koi/nn_bp.py</url>
-          <line>43</line>
-          <option name="timeStamp" value="136" />
+          <url>file://$PROJECT_DIR$/models_processing/model_koi/tf_lstm_pre.py</url>
+          <line>70</line>
+          <option name="timeStamp" value="231" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>

+ 1 - 0
evaluation_processing/analysis.py

@@ -238,6 +238,7 @@ def put_analysis_report_to_html(args, df_predict, df_accuracy):
     filename = f"{farmId}_{int(time.time() * 1000)}_{random.randint(1000, 9999)}.html"
     # 保存为 HTML
     directory = '/usr/share/nginx/html'
+    # directory = '../cache'
     if not os.path.exists(directory):
         os.makedirs(directory)
     file_path = os.path.join(directory, filename)

+ 0 - 0
models_processing/model_koi/async_query_task.py → models_processing/model_tf/async_query_task.py


+ 0 - 0
models_processing/model_koi/bp.yaml → models_processing/model_tf/bp.yaml


+ 0 - 0
models_processing/model_koi/cnn.yaml → models_processing/model_tf/cnn.yaml


+ 0 - 0
models_processing/model_koi/losses.py → models_processing/model_tf/losses.py


+ 0 - 0
models_processing/model_koi/lstm.yaml → models_processing/model_tf/lstm.yaml


+ 0 - 0
models_processing/model_koi/settings.py → models_processing/model_tf/settings.py


+ 0 - 0
models_processing/model_koi/test.py → models_processing/model_tf/test.py


+ 2 - 2
models_processing/model_koi/tf_bp.py → models_processing/model_tf/tf_bp.py

@@ -9,8 +9,8 @@ from tensorflow.keras.layers import Input, Dense, LSTM, concatenate, Conv1D, Con
 from tensorflow.keras.models import Model, load_model
 from tensorflow.keras.callbacks import ModelCheckpoint, EarlyStopping, TensorBoard, ReduceLROnPlateau
 from tensorflow.keras import optimizers, regularizers
-from models_processing.model_koi.losses import region_loss
-from models_processing.model_koi.settings import set_deterministic
+from models_processing.model_tf.losses import region_loss
+from models_processing.model_tf.settings import set_deterministic
 import numpy as np
 from common.database_dml_koi import *
 from threading import Lock

+ 0 - 0
models_processing/model_koi/tf_bp_pre.py → models_processing/model_tf/tf_bp_pre.py


+ 1 - 1
models_processing/model_koi/tf_bp_train.py → models_processing/model_tf/tf_bp_train.py

@@ -12,7 +12,7 @@ import traceback
 import logging, argparse
 from data_processing.data_operation.data_handler import DataHandler
 import time, yaml
-from models_processing.model_koi.tf_bp import BPHandler
+from models_processing.model_tf.tf_bp import BPHandler
 from common.database_dml_koi import *
 import matplotlib.pyplot as plt
 from common.logs import Log

+ 2 - 2
models_processing/model_koi/tf_cnn.py → models_processing/model_tf/tf_cnn.py

@@ -10,8 +10,8 @@ from tensorflow.keras.layers import Input, Dense, LSTM, concatenate, Conv1D, Con
 from tensorflow.keras.models import Model, load_model
 from tensorflow.keras.callbacks import ModelCheckpoint, EarlyStopping, TensorBoard, ReduceLROnPlateau
 from tensorflow.keras import optimizers, regularizers
-from models_processing.model_koi.losses import region_loss
-from models_processing.model_koi.settings import set_deterministic
+from models_processing.model_tf.losses import region_loss
+from models_processing.model_tf.settings import set_deterministic
 import numpy as np
 from common.database_dml_koi import *
 from threading import Lock

+ 0 - 0
models_processing/model_koi/tf_cnn_pre.py → models_processing/model_tf/tf_cnn_pre.py


+ 1 - 1
models_processing/model_koi/tf_cnn_train.py → models_processing/model_tf/tf_cnn_train.py

@@ -11,7 +11,7 @@ import traceback
 import logging, argparse
 from data_processing.data_operation.data_handler import DataHandler
 import time, yaml
-from models_processing.model_koi.tf_cnn import CNNHandler
+from models_processing.model_tf.tf_cnn import CNNHandler
 from common.database_dml_koi import *
 import matplotlib.pyplot as plt
 from common.logs import Log

+ 2 - 2
models_processing/model_koi/tf_lstm.py → models_processing/model_tf/tf_lstm.py

@@ -9,10 +9,10 @@ from tensorflow.keras.layers import Input, Dense, LSTM, concatenate, Conv1D, Con
 from tensorflow.keras.models import Model, load_model
 from tensorflow.keras.callbacks import ModelCheckpoint, EarlyStopping, TensorBoard, ReduceLROnPlateau
 from tensorflow.keras import optimizers, regularizers
-from models_processing.model_koi.losses import region_loss
+from models_processing.model_tf.losses import region_loss
 import numpy as np
 from common.database_dml_koi import *
-from models_processing.model_koi.settings import set_deterministic
+from models_processing.model_tf.settings import set_deterministic
 from threading import Lock
 import argparse
 model_lock = Lock()

+ 0 - 0
models_processing/model_koi/tf_lstm_pre.py → models_processing/model_tf/tf_lstm_pre.py


+ 1 - 1
models_processing/model_koi/tf_lstm_train.py → models_processing/model_tf/tf_lstm_train.py

@@ -11,7 +11,7 @@ import traceback, uuid
 import logging, argparse
 from data_processing.data_operation.data_handler import DataHandler
 import time, yaml, threading
-from models_processing.model_koi.tf_lstm import TSHandler
+from models_processing.model_tf.tf_lstm import TSHandler
 from common.database_dml_koi import *
 from common.logs import Log
 logger = Log('tf_ts').logger

+ 0 - 0
models_processing/model_koi/问题.txt → models_processing/model_tf/问题.txt