From e79ae5c2059fdc39c69616f006305d8d7e1b5167 Mon Sep 17 00:00:00 2001
From: lkrsnik <krsnik.luka92@gmail.com>
Date: Mon, 21 Aug 2017 09:30:14 +0200
Subject: [PATCH] Added some results

---
 .gitignore           |  2 ++
 .idea/workspace.xml  | 21 +++++++++++++--------
 40_epoch.h5          |  0
 40_epoch_history.pkl |  0
 workbench.py         |  9 ++++-----
 workbench.xrsl       |  6 +++---
 6 files changed, 22 insertions(+), 16 deletions(-)
 create mode 100644 40_epoch.h5
 create mode 100644 40_epoch_history.pkl

diff --git a/.gitignore b/.gitignore
index 5a86fd1..1312dca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -93,3 +93,5 @@ data/
 cnn/internal_representations/inputs/
 joblist.xml
 new_sloleks.xml
+grid_results/
+.idea/
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5eac1c0..ec9b006 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,13 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="8a8ba9af-e1a4-433a-9968-475192610776" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cnn/word_accetuation/cnn_dictionary/cnn.ipynb" afterPath="$PROJECT_DIR$/cnn/word_accetuation/cnn_dictionary/cnn.ipynb" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cnn/word_accetuation/cnn_dictionary/results_presentation.ipynb" afterPath="$PROJECT_DIR$/cnn/word_accetuation/cnn_dictionary/results_presentation.ipynb" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cnn/word_accetuation/cnn_dictionary/v3_4/notes" afterPath="$PROJECT_DIR$/cnn/word_accetuation/cnn_dictionary/v3_4/notes" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cnn/word_accetuation/cnn_dictionary/v3_7/cnn.ipynb" afterPath="$PROJECT_DIR$/cnn/word_accetuation/cnn_dictionary/v3_7/cnn.ipynb" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cnn/word_accetuation/cnn_dictionary/v4_0/cnn.ipynb" afterPath="$PROJECT_DIR$/cnn/word_accetuation/cnn_dictionary/v4_0/cnn.ipynb" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/workbench.py" afterPath="$PROJECT_DIR$/workbench.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/workbench.xrsl" afterPath="$PROJECT_DIR$/workbench.xrsl" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -33,7 +38,7 @@
       <file leaf-file-name="prepare_data.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/prepare_data.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="198">
+            <state relative-caret-position="108">
               <caret line="14" column="121" lean-forward="false" selection-start-line="14" selection-start-column="102" selection-end-line="14" selection-end-column="121" />
               <folding>
                 <element signature="e#24#63#0" expanded="true" />
@@ -67,8 +72,8 @@
       <file leaf-file-name="workbench.py" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/workbench.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="680">
-              <caret line="85" column="39" lean-forward="false" selection-start-line="85" selection-start-column="39" selection-end-line="85" selection-end-column="39" />
+            <state relative-caret-position="188">
+              <caret line="53" column="20" lean-forward="false" selection-start-line="53" selection-start-column="20" selection-end-line="53" selection-end-column="20" />
               <folding>
                 <element signature="e#24#63#0" expanded="true" />
               </folding>
@@ -220,7 +225,6 @@
     </navigator>
     <panes>
       <pane id="Scope" />
-      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -235,6 +239,7 @@
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -883,7 +888,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/prepare_data.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
+        <state relative-caret-position="108">
           <caret line="14" column="121" lean-forward="false" selection-start-line="14" selection-start-column="102" selection-end-line="14" selection-end-column="121" />
           <folding>
             <element signature="e#24#63#0" expanded="true" />
@@ -905,8 +910,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/workbench.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="680">
-          <caret line="85" column="39" lean-forward="false" selection-start-line="85" selection-start-column="39" selection-end-line="85" selection-end-column="39" />
+        <state relative-caret-position="188">
+          <caret line="53" column="20" lean-forward="false" selection-start-line="53" selection-start-column="20" selection-end-line="53" selection-end-column="20" />
           <folding>
             <element signature="e#24#63#0" expanded="true" />
           </folding>
diff --git a/40_epoch.h5 b/40_epoch.h5
new file mode 100644
index 0000000..e69de29
diff --git a/40_epoch_history.pkl b/40_epoch_history.pkl
new file mode 100644
index 0000000..e69de29
diff --git a/workbench.py b/workbench.py
index f79e672..ba03c2b 100644
--- a/workbench.py
+++ b/workbench.py
@@ -40,7 +40,7 @@ nn_output_dim = 10
 nn_hdim = 516
 batch_size = 16
 # actual_epoch = 1
-actual_epoch = 60
+actual_epoch = 40
 # num_fake_epoch = 2
 num_fake_epoch = 20
 
@@ -51,7 +51,7 @@ conv_input_shape=(23, 36)
 othr_input = (141, )
 
 conv_input = Input(shape=conv_input_shape, name='conv_input')
-x_conv = Conv1D(133, (3), padding='same', activation='relu')(conv_input)
+x_conv = Conv1D(115, (3), padding='same', activation='relu')(conv_input)
 x_conv = Conv1D(46, (3), padding='same', activation='relu')(x_conv)
 x_conv = MaxPooling1D(pool_size=2)(x_conv)
 x_conv = Flatten()(x_conv)
@@ -82,11 +82,10 @@ history = model.fit_generator(data.generator('train', batch_size, content_name='
                               epochs=actual_epoch*num_fake_epoch,
                               validation_data=data.generator('test', batch_size, content_name='SlovarIJS_BESEDE_utf8.lex', content_location=''),
                               validation_steps=data.x_test.shape[0]/(batch_size * num_fake_epoch),
-                              verbose=2,
-                              workers=4
+                              verbose=2
                               )
 
-name = '60_epoch'
+name = '40_epoch'
 model.save(name + '.h5')
 output = open(name + '_history.pkl', 'wb')
 pickle.dump(history.history, output)
diff --git a/workbench.xrsl b/workbench.xrsl
index 87c1317..c06e985 100644
--- a/workbench.xrsl
+++ b/workbench.xrsl
@@ -2,13 +2,13 @@
 (jobName="accetuation_nn")
 (executable="workbench.sh")
 (inputfiles=
-  ("workbench.py" "")("prepare_data.py" "")("content_shuffle_vector.h5" "cnn/internal_representations/inputs/content_shuffle_vector.h5")("shuffle_vector_test.h5" "cnn/internal_representations/inputs/shuffle_vector_test.h5")("shuffle_vector_train.h5" "cnn/internal_representations/inputs/shuffle_vector_train.h5")("shuffle_vector_validate.h5" "cnn/internal_representations/inputs/shuffle_vector_validate.h5")("SlovarIJS_BESEDE_utf8.lex" "data/SlovarIJS_BESEDE_utf8.lex")
+  ("workbench.py" "")("prepare_data.py" "")("content_shuffle_vector.h5" "cnn/internal_representations/inputs/content_shuffle_vector.h5")("shuffle_vector_test.h5" "cnn/internal_representations/inputs/shuffle_vector_test.h5")("shuffle_vector_train.h5" "cnn/internal_representations/inputs/shuffle_vector_train.h5")("shuffle_vector_validate.h5" "cnn/internal_representations/inputs/shuffle_vector_validate.h5")("SlovarIJS_BESEDE_utf8.lex" "data/SlovarIJS_BESEDE_utf8.lex")("40_epoch.h5" "")("40_epoch_history.pkl" "")
 )
-(outputfiles=("60_epoch.h5" "")("workbench.py" "")("workbench.sh" "")("60_epoch_history.pkl" "")
+(outputfiles=("40_epoch.h5" "")("workbench.py" "")("workbench.sh" "")("40_epoch_history.pkl" "")
 )
 (stdout="out.txt")
 (stderr="err.txt")
 (gmlog="gmlog")
 (runtimeenvironment="APPS/BASE/THEANO-GPU-0.9")
-(gridTime=1000)
+(gridTime=2000)
 (memory=12000)