From b8e6dfcbc20b819d58dd69824a9fb542b7cdafeb Mon Sep 17 00:00:00 2001
From: Newnius <newnius.cn@gmail.com>
Date: Sat, 2 May 2020 08:50:39 +0800
Subject: [PATCH] update

---
 .idea/workspace.xml | 61 ++++++++++++++++++++++-----------------------
 train.py            | 10 ++++----
 2 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 42c1a53..38fa7ac 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,6 @@
   <component name="ChangeListManager">
     <list default="true" id="0aedafd8-e57e-462a-beda-65af0b91f3df" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/serve.py" beforeDir="false" afterPath="$PROJECT_DIR$/serve.py" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -48,7 +47,7 @@
         <counts>
           <entry key="Dockerfile" value="81" />
           <entry key="md" value="104" />
-          <entry key="py" value="2434" />
+          <entry key="py" value="2437" />
           <entry key="sh" value="5" />
         </counts>
       </usages-collector>
@@ -57,7 +56,7 @@
           <entry key="Bash" value="5" />
           <entry key="Dockerfile" value="81" />
           <entry key="Markdown" value="104" />
-          <entry key="Python" value="2434" />
+          <entry key="Python" value="2437" />
         </counts>
       </usages-collector>
     </session>
@@ -76,10 +75,10 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/serve.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="387">
+            <state relative-caret-position="-1984">
               <caret line="186" column="30" selection-start-line="186" selection-start-column="30" selection-end-line="186" selection-end-column="30" />
               <folding>
                 <element signature="e#18#46#0" expanded="true" />
@@ -89,11 +88,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/train.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="178">
-              <caret line="67" column="49" selection-start-line="67" selection-start-column="42" selection-end-line="67" selection-end-column="49" />
+            <state relative-caret-position="110">
+              <caret line="20" column="42" lean-forward="true" selection-start-line="20" selection-start-column="42" selection-end-line="20" selection-end-column="42" />
               <folding>
                 <element signature="e#0#28#0" expanded="true" />
               </folding>
@@ -180,8 +179,8 @@
         <option value="$PROJECT_DIR$/main.py" />
         <option value="$PROJECT_DIR$/model_tensorflow.py" />
         <option value="$PROJECT_DIR$/Dockerfile" />
-        <option value="$PROJECT_DIR$/train.py" />
         <option value="$PROJECT_DIR$/serve.py" />
+        <option value="$PROJECT_DIR$/train.py" />
       </list>
     </option>
   </component>
@@ -224,7 +223,7 @@
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1588357393746" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1588380374547" />
     <property name="go.gopath.indexing.explicitly.defined" value="true" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -265,12 +264,12 @@
       <option name="presentableId" value="Default" />
       <updated>1588152877746</updated>
       <workItem from="1588152880522" duration="16973000" />
-      <workItem from="1588319878551" duration="16609000" />
+      <workItem from="1588319878551" duration="17012000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="33582000" />
+    <option name="totallyTimeSpent" value="33985000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1280" height="800" extended-state="0" />
@@ -363,12 +362,23 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/train.py">
+    <entry file="file://$PROJECT_DIR$/model_tensorflow.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="178">
-          <caret line="67" column="49" selection-start-line="67" selection-start-column="42" selection-end-line="67" selection-end-column="49" />
+        <state relative-caret-position="297">
+          <caret line="48" lean-forward="true" selection-start-line="48" selection-end-line="48" />
           <folding>
-            <element signature="e#0#28#0" expanded="true" />
+            <element signature="e#0#23#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/serve.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1984">
+          <caret line="186" column="30" selection-start-line="186" selection-start-column="30" selection-end-line="186" selection-end-column="30" />
+          <folding>
+            <element signature="e#18#46#0" expanded="true" />
+            <marker date="1588357497851" expanded="true" signature="5576:5578" ph="..." />
           </folding>
         </state>
       </provider>
@@ -383,23 +393,12 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/model_tensorflow.py">
+    <entry file="file://$PROJECT_DIR$/train.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="297">
-          <caret line="48" lean-forward="true" selection-start-line="48" selection-end-line="48" />
+        <state relative-caret-position="110">
+          <caret line="20" column="42" lean-forward="true" selection-start-line="20" selection-start-column="42" selection-end-line="20" selection-end-column="42" />
           <folding>
-            <element signature="e#0#23#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/serve.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="387">
-          <caret line="186" column="30" selection-start-line="186" selection-start-column="30" selection-end-line="186" selection-end-column="30" />
-          <folding>
-            <element signature="e#18#46#0" expanded="true" />
-            <marker date="1588357497851" expanded="true" signature="5576:5578" ph="..." />
+            <element signature="e#0#28#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/train.py b/train.py
index b09f6b8..9f63cf8 100644
--- a/train.py
+++ b/train.py
@@ -111,18 +111,18 @@ lstm_model.predict(train_reshaped, batch_size=1)
 
 # walk-forward validation on the test data
 predictions = list()
-for i in range(len(test_scaled)):
+for j in range(len(test_scaled)):
 	# make one-step forecast
-	X, y = test_scaled[i, 0:-1], test_scaled[i, -1]
+	X, y = test_scaled[j, 0:-1], test_scaled[j, -1]
 	yhat = forecast_lstm(lstm_model, 1, X)
 	# invert scaling
 	yhat = invert_scale(scaler, X, yhat)
 	# invert differencing
-	yhat = inverse_difference(raw_values, yhat, len(test_scaled) + 1 - i)
+	yhat = inverse_difference(raw_values, yhat, len(test_scaled) + 1 - j)
 	# store forecast
 	predictions.append(yhat)
-	expected = raw_values[len(train) + i + 1]
-	print('Month=%d, Predicted=%f, Expected=%f' % (i + 1, yhat, expected))
+	expected = raw_values[len(train) + j + 1]
+	print('Month=%d, Predicted=%f, Expected=%f' % (j + 1, yhat, expected))
 
 # report performance
 rmse = sqrt(mean_squared_error(raw_values[-12:], predictions))