From d0d9e3f5bc0a6937ce8c864b8b9f67f0db87be17 Mon Sep 17 00:00:00 2001
From: Newnius <newnius.cn@gmail.com>
Date: Sat, 2 May 2020 09:47:26 +0800
Subject: [PATCH] update

---
 .idea/workspace.xml | 45 +++++++++++++++++++++++----------------------
 train.py            | 25 +++++++++++--------------
 2 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4c7a75f..a383f35 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,6 +3,7 @@
   <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$/train.py" beforeDir="false" afterPath="$PROJECT_DIR$/train.py" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -47,7 +48,7 @@
         <counts>
           <entry key="Dockerfile" value="81" />
           <entry key="md" value="104" />
-          <entry key="py" value="2508" />
+          <entry key="py" value="2552" />
           <entry key="sh" value="5" />
         </counts>
       </usages-collector>
@@ -56,7 +57,7 @@
           <entry key="Bash" value="5" />
           <entry key="Dockerfile" value="81" />
           <entry key="Markdown" value="104" />
-          <entry key="Python" value="2508" />
+          <entry key="Python" value="2552" />
         </counts>
       </usages-collector>
     </session>
@@ -78,8 +79,8 @@
       <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="-1984">
-              <caret line="186" column="30" selection-start-line="186" selection-start-column="30" selection-end-line="186" selection-end-column="30" />
+            <state relative-caret-position="87">
+              <caret line="326" lean-forward="true" selection-start-line="326" selection-end-line="326" />
               <folding>
                 <element signature="e#18#46#0" expanded="true" />
                 <marker date="1588357497851" expanded="true" signature="5576:5578" ph="..." />
@@ -91,8 +92,8 @@
       <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="274">
-              <caret line="108" column="18" selection-start-line="108" selection-start-column="6" selection-end-line="108" selection-end-column="18" />
+            <state relative-caret-position="164">
+              <caret line="112" column="20" lean-forward="true" selection-start-line="112" selection-start-column="20" selection-end-line="112" selection-end-column="20" />
               <folding>
                 <element signature="e#0#28#0" expanded="true" />
               </folding>
@@ -223,7 +224,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="1588383675146" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1588383870868" />
     <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" />
@@ -264,12 +265,12 @@
       <option name="presentableId" value="Default" />
       <updated>1588152877746</updated>
       <workItem from="1588152880522" duration="16973000" />
-      <workItem from="1588319878551" duration="19571000" />
+      <workItem from="1588319878551" duration="20056000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="36544000" />
+    <option name="totallyTimeSpent" value="37029000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1280" height="800" extended-state="0" />
@@ -372,17 +373,6 @@
         </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>
-    </entry>
     <entry file="file://$PROJECT_DIR$/README.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
@@ -393,10 +383,21 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/serve.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="87">
+          <caret line="326" lean-forward="true" selection-start-line="326" selection-end-line="326" />
+          <folding>
+            <element signature="e#18#46#0" expanded="true" />
+            <marker date="1588357497851" expanded="true" signature="5576:5578" ph="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/train.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="108" column="18" selection-start-line="108" selection-start-column="6" selection-end-line="108" selection-end-column="18" />
+        <state relative-caret-position="164">
+          <caret line="112" column="20" lean-forward="true" selection-start-line="112" selection-start-column="20" selection-end-line="112" selection-end-column="20" />
           <folding>
             <element signature="e#0#28#0" expanded="true" />
           </folding>
diff --git a/train.py b/train.py
index 2133494..9f63cf8 100644
--- a/train.py
+++ b/train.py
@@ -12,6 +12,11 @@ from math import sqrt
 import numpy
 
 
+# date-time parsing function for loading the dataset
+def parser(x):
+	return datetime.strptime('190' + x, '%Y-%m')
+
+
 # frame a sequence as a supervised learning problem
 def timeseries_to_supervised(data, lag=1):
 	df = DataFrame(data)
@@ -76,13 +81,11 @@ def fit_lstm(train, batch_size, nb_epoch, neurons):
 
 # make a one-step forecast
 def forecast_lstm(model, batch_size, X):
-	X = X.reshape(X.shape[0], X.shape[1], len(X))
+	X = X.reshape(1, 1, len(X))
 	yhat = model.predict(X, batch_size=batch_size)
 	return yhat[0, 0]
 
 
-batch_size = 12
-
 # load dataset
 series = read_csv('data.csv', header=0, index_col=0, squeeze=True)
 
@@ -101,25 +104,19 @@ train, test = supervised_values[0:-12], supervised_values[-12:]
 scaler, train_scaled, test_scaled = scale(train, test)
 
 # fit the model
-lstm_model = fit_lstm(train_scaled, batch_size, 30, 4)
+lstm_model = fit_lstm(train_scaled, 1, 30, 4)
 # forecast the entire training dataset to build up state for forecasting
 train_reshaped = train_scaled[:, 0].reshape(len(train_scaled), 1, 1)
-lstm_model.predict(train_reshaped, batch_size=batch_size)
-
-print(raw_values)
-print(diff_values)
-print(supervised_values)
-print(train, test)
-print(train_scaled, test_scaled)
+lstm_model.predict(train_reshaped, batch_size=1)
 
 # walk-forward validation on the test data
 predictions = list()
 for j in range(len(test_scaled)):
 	# make one-step forecast
-	#X, y = test_scaled[j, 0:-1], test_scaled[j, -1]
-	yhat = forecast_lstm(lstm_model, batch_size, test_scaled)
+	X, y = test_scaled[j, 0:-1], test_scaled[j, -1]
+	yhat = forecast_lstm(lstm_model, 1, X)
 	# invert scaling
-	yhat = invert_scale(scaler, test_scaled, yhat)
+	yhat = invert_scale(scaler, X, yhat)
 	# invert differencing
 	yhat = inverse_difference(raw_values, yhat, len(test_scaled) + 1 - j)
 	# store forecast