so much betterrrrrr

jshtaway · Oct 23, 2018 · 5210f5f · 5210f5f
1 parent 0a1496a
commit 5210f5f
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 12 deletions.
diff --git a/word_based.ipynb b/word_based.ipynb
@@ -268,18 +268,25 @@
     "    #-- -- ---- --- --- --- --- --- ---- --- --- --- --\n",
     "\n",
     "    #-- Model List --- --- --- --- --- --- --- --- --- -- ---- --- --- --- ---- -- --\n",
+    "#     modelList = [{'model':'Embedding', 'input_dim':vocab_size, 'output_dim': 256, 'input_length': seq_length},\n",
+    "#                  {'model': 'LSTM', 'units':256, 'use_bias':True, 'dropout':.2, 'recurrent_dropout': 0, 'return_sequences': True}, \n",
+    "#                  {'model': 'Dense','units':64,'activation':'relu'}, \n",
+    "#                  {'model': 'LSTM', 'units':256, 'use_bias':True, 'dropout':.2, 'recurrent_dropout': 0, 'return_sequences': True}, \n",
+    "#                  {'model': 'Dense','units':64,'activation':'relu'}, \n",
+    "#                  {'model':'Flatten'},\n",
+    "#                  {'model': 'Dense','units':vocab_size,'activation':'softmax'},\n",
+    "#                 ]\n",
     "    modelList = [{'model':'Embedding', 'input_dim':vocab_size, 'output_dim': 256, 'input_length': seq_length},\n",
     "                 {'model': 'LSTM', 'units':256, 'use_bias':True, 'dropout':.2, 'recurrent_dropout': 0, 'return_sequences': True}, \n",
-    "                 {'model': 'Dense','units':64,'activation':'relu'}, \n",
+    "                 {'model': 'Dense','units':100,'activation':'relu'}, \n",
     "                 {'model': 'LSTM', 'units':256, 'use_bias':True, 'dropout':.2, 'recurrent_dropout': 0, 'return_sequences': True}, \n",
-    "                 {'model': 'Dense','units':64,'activation':'relu'}, \n",
+    "                 {'model': 'Dense','units':100,'activation':'relu'}, \n",
+    "                 {'model': 'LSTM', 'units':256, 'use_bias':True, 'dropout':.2, 'recurrent_dropout': 0, 'return_sequences': True}, \n",
+    "                 {'model': 'Dense','units':100,'activation':'relu'}, \n",
     "                 {'model':'Flatten'},\n",
     "                 {'model': 'Dense','units':vocab_size,'activation':'softmax'},\n",
     "                ]\n",
-    "#     modelList = [('Embedding', vocab_size, seq_length), ('LSTM',256,'True'), ('Dense',256,'relu'), ('Dropout',.2,''), \n",
-    "#                  ('LSTM',128,'True'), ('Dense',128,'relu'), ('Dropout',.2,''), \n",
-    "#                  ('LSTM', 64,'False'), ('Dense',64,'relu'), \n",
-    "#                  ('Flatten','',''),('Dense',vocab_size,'softmax')]\n",
+    "\n",
     "    #-- --- ---- --- ---- --- --- ---- --- ---- --- ---- --- ---- --- --- --- --- ---\n",
     "    \n",
     "    print(f'drseuss_text: \\'{drseuss_text}\\'\\nseed_length: {seed_length}\\nepochs: {epochs}\\nbatch_size: {batch_size}'\n",

diff --git a/word_based.py b/word_based.py
@@ -221,18 +221,25 @@ def trainModelComplete():
     #-- -- ---- --- --- --- --- --- ---- --- --- --- --
 
     #-- Model List --- --- --- --- --- --- --- --- --- -- ---- --- --- --- ---- -- --
+#     modelList = [{'model':'Embedding', 'input_dim':vocab_size, 'output_dim': 256, 'input_length': seq_length},
+#                  {'model': 'LSTM', 'units':256, 'use_bias':True, 'dropout':.2, 'recurrent_dropout': 0, 'return_sequences': True}, 
+#                  {'model': 'Dense','units':64,'activation':'relu'}, 
+#                  {'model': 'LSTM', 'units':256, 'use_bias':True, 'dropout':.2, 'recurrent_dropout': 0, 'return_sequences': True}, 
+#                  {'model': 'Dense','units':64,'activation':'relu'}, 
+#                  {'model':'Flatten'},
+#                  {'model': 'Dense','units':vocab_size,'activation':'softmax'},
+#                 ]
     modelList = [{'model':'Embedding', 'input_dim':vocab_size, 'output_dim': 256, 'input_length': seq_length},
                  {'model': 'LSTM', 'units':256, 'use_bias':True, 'dropout':.2, 'recurrent_dropout': 0, 'return_sequences': True}, 
-                 {'model': 'Dense','units':64,'activation':'relu'}, 
+                 {'model': 'Dense','units':100,'activation':'relu'}, 
                  {'model': 'LSTM', 'units':256, 'use_bias':True, 'dropout':.2, 'recurrent_dropout': 0, 'return_sequences': True}, 
-                 {'model': 'Dense','units':64,'activation':'relu'}, 
+                 {'model': 'Dense','units':100,'activation':'relu'}, 
+                 {'model': 'LSTM', 'units':256, 'use_bias':True, 'dropout':.2, 'recurrent_dropout': 0, 'return_sequences': True}, 
+                 {'model': 'Dense','units':100,'activation':'relu'}, 
                  {'model':'Flatten'},
                  {'model': 'Dense','units':vocab_size,'activation':'softmax'},
                 ]
-#     modelList = [('Embedding', vocab_size, seq_length), ('LSTM',256,'True'), ('Dense',256,'relu'), ('Dropout',.2,''), 
-#                  ('LSTM',128,'True'), ('Dense',128,'relu'), ('Dropout',.2,''), 
-#                  ('LSTM', 64,'False'), ('Dense',64,'relu'), 
-#                  ('Flatten','',''),('Dense',vocab_size,'softmax')]
+
     #-- --- ---- --- ---- --- --- ---- --- ---- --- ---- --- ---- --- --- --- --- ---
 
     print(f'drseuss_text: \'{drseuss_text}\'\nseed_length: {seed_length}\nepochs: {epochs}\nbatch_size: {batch_size}'