Skip to content

Commit 2228716

Browse files
SeanMcOwenSeanMcOwen
committed
Finish up cleanup
1 parent 1c8f7b2 commit 2228716

File tree

9 files changed

+242
-256
lines changed

9 files changed

+242
-256
lines changed

‎cadCADModels/models1.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
import sys
33
from copy import deepcopy
44

5-
sys.path.append(os.path.abspath("../.."))
6-
from MSML.src.math_spec_mapping import load_from_json
5+
from math_spec_mapping import load_from_json
76

87

98
from src import math_spec_json
109
from simulation import compute_starting_total_length, check_d_probability
1110

12-
ms = load_from_json(deepcopy(math_spec_json))
11+
ms = load_from_json(deepcopy(math_spec_json), spec_path="../src")
1312

1413
blocks1 = [
1514
"DUMMY Length-2 Boundary Wiring",

‎notebooks/Build Obsidian.ipynb

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
},
1717
{
1818
"cell_type": "code",
19-
"execution_count": 3,
19+
"execution_count": 1,
2020
"metadata": {},
2121
"outputs": [],
2222
"source": [
@@ -26,11 +26,11 @@
2626
"sys.path.append(os.path.abspath('..'))\n",
2727
"\n",
2828
"\n",
29-
"#from math_spec_mapping import load_from_json, write_all_markdown_reports, write_spec_tree, write_overview\n",
29+
"from math_spec_mapping import load_from_json, write_all_markdown_reports, write_spec_tree, write_overview\n",
3030
"\n",
3131
"# For development purposes\n",
32-
"sys.path.append(os.path.abspath('../..'))\n",
33-
"from MSML.src.math_spec_mapping import (load_from_json, write_all_markdown_reports, write_spec_tree, write_overview)\n",
32+
"#sys.path.append(os.path.abspath('../..'))\n",
33+
"#from MSML.src.math_spec_mapping import (load_from_json, write_all_markdown_reports, write_spec_tree, write_overview)\n",
3434
"\n",
3535
"from src import math_spec_json\n",
3636
"from copy import deepcopy\n",
@@ -55,7 +55,7 @@
5555
},
5656
{
5757
"cell_type": "code",
58-
"execution_count": 4,
58+
"execution_count": 2,
5959
"metadata": {},
6060
"outputs": [],
6161
"source": [
@@ -65,13 +65,6 @@
6565
"write_spec_tree(ms, path=write_folder, linking=True)\n",
6666
"write_overview(ms, \"MSML Template\", \"../README.md\", base_folder=\"../README-Base.md\")"
6767
]
68-
},
69-
{
70-
"cell_type": "code",
71-
"execution_count": null,
72-
"metadata": {},
73-
"outputs": [],
74-
"source": []
7568
}
7669
],
7770
"metadata": {

‎notebooks/Build cadCAD.ipynb

Lines changed: 40 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
" percent_ending_in_d_metric, average_d_count_metric, plot_length_single_simulation,)\n",
2727
"\n",
2828
"\n",
29-
"#from math_spec_mapping import load_from_json\n",
30-
"sys.path.append(os.path.abspath('../..'))\n",
31-
"from MSML.src.math_spec_mapping import (load_from_json, get_nested_types)\n",
29+
"from math_spec_mapping import load_from_json, get_nested_types\n",
30+
"#sys.path.append(os.path.abspath('../..'))\n",
31+
"#from MSML.src.math_spec_mapping import (load_from_json, get_nested_types)\n",
3232
"\n",
3333
"from copy import deepcopy\n",
3434
"from src import math_spec_json\n",
@@ -58,6 +58,13 @@
5858
" parameter_preperation_functions=[check_d_probability],)).values()"
5959
]
6060
},
61+
{
62+
"cell_type": "markdown",
63+
"metadata": {},
64+
"source": [
65+
"Display the nested types involved in the state space and parameter space"
66+
]
67+
},
6168
{
6269
"cell_type": "code",
6370
"execution_count": 3,
@@ -117,37 +124,37 @@
117124
{
118125
"data": {
119126
"text/plain": [
120-
"[{'Dummy': {'Words': 'ABCFCAADCCAFABAE', 'Total Length': 48},\n",
127+
"[{'Dummy': {'Words': 'BAADBCCDAABDABBD', 'Total Length': 48},\n",
121128
" 'Time': 12,\n",
122-
" 'Simulation Log': [{'Time': 1, 'Word': 'AB', 'Length (Multiplied)': 6},\n",
123-
" {'Time': 2, 'Word': 'ABC', 'Length (Multiplied)': 9},\n",
124-
" {'Time': 3, 'Word': 'ABCF', 'Length (Multiplied)': 12},\n",
125-
" {'Time': 4, 'Word': 'ABCFCA', 'Length (Multiplied)': 18},\n",
126-
" {'Time': 5, 'Word': 'ABCFCAA', 'Length (Multiplied)': 21},\n",
127-
" {'Time': 6, 'Word': 'ABCFCAAD', 'Length (Multiplied)': 24},\n",
128-
" {'Time': 7, 'Word': 'ABCFCAADCC', 'Length (Multiplied)': 30},\n",
129-
" {'Time': 8, 'Word': 'ABCFCAADCCA', 'Length (Multiplied)': 33},\n",
130-
" {'Time': 9, 'Word': 'ABCFCAADCCAF', 'Length (Multiplied)': 36},\n",
131-
" {'Time': 10, 'Word': 'ABCFCAADCCAFAB', 'Length (Multiplied)': 42},\n",
132-
" {'Time': 11, 'Word': 'ABCFCAADCCAFABA', 'Length (Multiplied)': 45},\n",
133-
" {'Time': 12, 'Word': 'ABCFCAADCCAFABAE', 'Length (Multiplied)': 48}]},\n",
134-
" {'Dummy': {'Words': 'ABCFCAADCCAFABAEBBBD', 'Total Length': 60},\n",
129+
" 'Simulation Log': [{'Time': 1, 'Word': 'BA', 'Length (Multiplied)': 6},\n",
130+
" {'Time': 2, 'Word': 'BAA', 'Length (Multiplied)': 9},\n",
131+
" {'Time': 3, 'Word': 'BAAD', 'Length (Multiplied)': 12},\n",
132+
" {'Time': 4, 'Word': 'BAADBC', 'Length (Multiplied)': 18},\n",
133+
" {'Time': 5, 'Word': 'BAADBCC', 'Length (Multiplied)': 21},\n",
134+
" {'Time': 6, 'Word': 'BAADBCCD', 'Length (Multiplied)': 24},\n",
135+
" {'Time': 7, 'Word': 'BAADBCCDAA', 'Length (Multiplied)': 30},\n",
136+
" {'Time': 8, 'Word': 'BAADBCCDAAB', 'Length (Multiplied)': 33},\n",
137+
" {'Time': 9, 'Word': 'BAADBCCDAABD', 'Length (Multiplied)': 36},\n",
138+
" {'Time': 10, 'Word': 'BAADBCCDAABDAB', 'Length (Multiplied)': 42},\n",
139+
" {'Time': 11, 'Word': 'BAADBCCDAABDABB', 'Length (Multiplied)': 45},\n",
140+
" {'Time': 12, 'Word': 'BAADBCCDAABDABBD', 'Length (Multiplied)': 48}]},\n",
141+
" {'Dummy': {'Words': 'BAADBCCDAABDABBDACBE', 'Total Length': 60},\n",
135142
" 'Time': 15,\n",
136-
" 'Simulation Log': [{'Time': 1, 'Word': 'AB', 'Length (Multiplied)': 6},\n",
137-
" {'Time': 2, 'Word': 'ABC', 'Length (Multiplied)': 9},\n",
138-
" {'Time': 3, 'Word': 'ABCF', 'Length (Multiplied)': 12},\n",
139-
" {'Time': 4, 'Word': 'ABCFCA', 'Length (Multiplied)': 18},\n",
140-
" {'Time': 5, 'Word': 'ABCFCAA', 'Length (Multiplied)': 21},\n",
141-
" {'Time': 6, 'Word': 'ABCFCAAD', 'Length (Multiplied)': 24},\n",
142-
" {'Time': 7, 'Word': 'ABCFCAADCC', 'Length (Multiplied)': 30},\n",
143-
" {'Time': 8, 'Word': 'ABCFCAADCCA', 'Length (Multiplied)': 33},\n",
144-
" {'Time': 9, 'Word': 'ABCFCAADCCAF', 'Length (Multiplied)': 36},\n",
145-
" {'Time': 10, 'Word': 'ABCFCAADCCAFAB', 'Length (Multiplied)': 42},\n",
146-
" {'Time': 11, 'Word': 'ABCFCAADCCAFABA', 'Length (Multiplied)': 45},\n",
147-
" {'Time': 12, 'Word': 'ABCFCAADCCAFABAE', 'Length (Multiplied)': 48},\n",
148-
" {'Time': 13, 'Word': 'ABCFCAADCCAFABAEBB', 'Length (Multiplied)': 54},\n",
149-
" {'Time': 14, 'Word': 'ABCFCAADCCAFABAEBBB', 'Length (Multiplied)': 57},\n",
150-
" {'Time': 15, 'Word': 'ABCFCAADCCAFABAEBBBD', 'Length (Multiplied)': 60}]}]"
143+
" 'Simulation Log': [{'Time': 1, 'Word': 'BA', 'Length (Multiplied)': 6},\n",
144+
" {'Time': 2, 'Word': 'BAA', 'Length (Multiplied)': 9},\n",
145+
" {'Time': 3, 'Word': 'BAAD', 'Length (Multiplied)': 12},\n",
146+
" {'Time': 4, 'Word': 'BAADBC', 'Length (Multiplied)': 18},\n",
147+
" {'Time': 5, 'Word': 'BAADBCC', 'Length (Multiplied)': 21},\n",
148+
" {'Time': 6, 'Word': 'BAADBCCD', 'Length (Multiplied)': 24},\n",
149+
" {'Time': 7, 'Word': 'BAADBCCDAA', 'Length (Multiplied)': 30},\n",
150+
" {'Time': 8, 'Word': 'BAADBCCDAAB', 'Length (Multiplied)': 33},\n",
151+
" {'Time': 9, 'Word': 'BAADBCCDAABD', 'Length (Multiplied)': 36},\n",
152+
" {'Time': 10, 'Word': 'BAADBCCDAABDAB', 'Length (Multiplied)': 42},\n",
153+
" {'Time': 11, 'Word': 'BAADBCCDAABDABB', 'Length (Multiplied)': 45},\n",
154+
" {'Time': 12, 'Word': 'BAADBCCDAABDABBD', 'Length (Multiplied)': 48},\n",
155+
" {'Time': 13, 'Word': 'BAADBCCDAABDABBDAC', 'Length (Multiplied)': 54},\n",
156+
" {'Time': 14, 'Word': 'BAADBCCDAABDABBDACB', 'Length (Multiplied)': 57},\n",
157+
" {'Time': 15, 'Word': 'BAADBCCDAABDABBDACBE', 'Length (Multiplied)': 60}]}]"
151158
]
152159
},
153160
"metadata": {},
@@ -185,7 +192,7 @@
185192
"name": "stdout",
186193
"output_type": "stream",
187194
"text": [
188-
"[[{'Dummy': {'Words': '', 'Total Length': 0}, 'Time': 0, 'Simulation Log': []}, {'Dummy': {'Words': 'BAAD', 'Total Length': 12}, 'Time': 3, 'Simulation Log': [{'Time': 1, 'Word': 'BA', 'Length (Multiplied)': 6}, {'Time': 2, 'Word': 'BAA', 'Length (Multiplied)': 9}, {'Time': 3, 'Word': 'BAAD', 'Length (Multiplied)': 12}]}, {'Dummy': {'Words': 'BAADCACE', 'Total Length': 24}, 'Time': 6, 'Simulation Log': [{'Time': 1, 'Word': 'BA', 'Length (Multiplied)': 6}, {'Time': 2, 'Word': 'BAA', 'Length (Multiplied)': 9}, {'Time': 3, 'Word': 'BAAD', 'Length (Multiplied)': 12}, {'Time': 4, 'Word': 'BAADCA', 'Length (Multiplied)': 18}, {'Time': 5, 'Word': 'BAADCAC', 'Length (Multiplied)': 21}, {'Time': 6, 'Word': 'BAADCACE', 'Length (Multiplied)': 24}]}, {'Dummy': {'Words': 'BAADCACEBBAD', 'Total Length': 36}, 'Time': 9, 'Simulation Log': [{'Time': 1, 'Word': 'BA', 'Length (Multiplied)': 6}, {'Time': 2, 'Word': 'BAA', 'Length (Multiplied)': 9}, {'Time': 3, 'Word': 'BAAD', 'Length (Multiplied)': 12}, {'Time': 4, 'Word': 'BAADCA', 'Length (Multiplied)': 18}, {'Time': 5, 'Word': 'BAADCAC', 'Length (Multiplied)': 21}, {'Time': 6, 'Word': 'BAADCACE', 'Length (Multiplied)': 24}, {'Time': 7, 'Word': 'BAADCACEBB', 'Length (Multiplied)': 30}, {'Time': 8, 'Word': 'BAADCACEBBA', 'Length (Multiplied)': 33}, {'Time': 9, 'Word': 'BAADCACEBBAD', 'Length (Multiplied)': 36}]}], [{'Dummy': {'Words': '', 'Total Length': 0}, 'Time': 0, 'Simulation Log': []}, {'Dummy': {'Words': 'ACAF', 'Total Length': 12}, 'Time': 3, 'Simulation Log': [{'Time': 1, 'Word': 'AC', 'Length (Multiplied)': 6}, {'Time': 2, 'Word': 'ACA', 'Length (Multiplied)': 9}, {'Time': 3, 'Word': 'ACAF', 'Length (Multiplied)': 12}]}, {'Dummy': {'Words': 'ACAFBAAD', 'Total Length': 24}, 'Time': 6, 'Simulation Log': [{'Time': 1, 'Word': 'AC', 'Length (Multiplied)': 6}, {'Time': 2, 'Word': 'ACA', 'Length (Multiplied)': 9}, {'Time': 3, 'Word': 'ACAF', 'Length (Multiplied)': 12}, {'Time': 4, 'Word': 'ACAFBA', 'Length (Multiplied)': 18}, {'Time': 5, 'Word': 'ACAFBAA', 'Length (Multiplied)': 21}, {'Time': 6, 'Word': 'ACAFBAAD', 'Length (Multiplied)': 24}]}, {'Dummy': {'Words': 'ACAFBAADCBAE', 'Total Length': 36}, 'Time': 9, 'Simulation Log': [{'Time': 1, 'Word': 'AC', 'Length (Multiplied)': 6}, {'Time': 2, 'Word': 'ACA', 'Length (Multiplied)': 9}, {'Time': 3, 'Word': 'ACAF', 'Length (Multiplied)': 12}, {'Time': 4, 'Word': 'ACAFBA', 'Length (Multiplied)': 18}, {'Time': 5, 'Word': 'ACAFBAA', 'Length (Multiplied)': 21}, {'Time': 6, 'Word': 'ACAFBAAD', 'Length (Multiplied)': 24}, {'Time': 7, 'Word': 'ACAFBAADCB', 'Length (Multiplied)': 30}, {'Time': 8, 'Word': 'ACAFBAADCBA', 'Length (Multiplied)': 33}, {'Time': 9, 'Word': 'ACAFBAADCBAE', 'Length (Multiplied)': 36}]}]]\n",
195+
"[[{'Dummy': {'Words': '', 'Total Length': 0}, 'Time': 0, 'Simulation Log': []}, {'Dummy': {'Words': 'ABCE', 'Total Length': 12}, 'Time': 3, 'Simulation Log': [{'Time': 1, 'Word': 'AB', 'Length (Multiplied)': 6}, {'Time': 2, 'Word': 'ABC', 'Length (Multiplied)': 9}, {'Time': 3, 'Word': 'ABCE', 'Length (Multiplied)': 12}]}, {'Dummy': {'Words': 'ABCECBCE', 'Total Length': 24}, 'Time': 6, 'Simulation Log': [{'Time': 1, 'Word': 'AB', 'Length (Multiplied)': 6}, {'Time': 2, 'Word': 'ABC', 'Length (Multiplied)': 9}, {'Time': 3, 'Word': 'ABCE', 'Length (Multiplied)': 12}, {'Time': 4, 'Word': 'ABCECB', 'Length (Multiplied)': 18}, {'Time': 5, 'Word': 'ABCECBC', 'Length (Multiplied)': 21}, {'Time': 6, 'Word': 'ABCECBCE', 'Length (Multiplied)': 24}]}, {'Dummy': {'Words': 'ABCECBCEACBD', 'Total Length': 36}, 'Time': 9, 'Simulation Log': [{'Time': 1, 'Word': 'AB', 'Length (Multiplied)': 6}, {'Time': 2, 'Word': 'ABC', 'Length (Multiplied)': 9}, {'Time': 3, 'Word': 'ABCE', 'Length (Multiplied)': 12}, {'Time': 4, 'Word': 'ABCECB', 'Length (Multiplied)': 18}, {'Time': 5, 'Word': 'ABCECBC', 'Length (Multiplied)': 21}, {'Time': 6, 'Word': 'ABCECBCE', 'Length (Multiplied)': 24}, {'Time': 7, 'Word': 'ABCECBCEAC', 'Length (Multiplied)': 30}, {'Time': 8, 'Word': 'ABCECBCEACB', 'Length (Multiplied)': 33}, {'Time': 9, 'Word': 'ABCECBCEACBD', 'Length (Multiplied)': 36}]}], [{'Dummy': {'Words': '', 'Total Length': 0}, 'Time': 0, 'Simulation Log': []}, {'Dummy': {'Words': 'AACD', 'Total Length': 12}, 'Time': 3, 'Simulation Log': [{'Time': 1, 'Word': 'AA', 'Length (Multiplied)': 6}, {'Time': 2, 'Word': 'AAC', 'Length (Multiplied)': 9}, {'Time': 3, 'Word': 'AACD', 'Length (Multiplied)': 12}]}, {'Dummy': {'Words': 'AACDACBF', 'Total Length': 24}, 'Time': 6, 'Simulation Log': [{'Time': 1, 'Word': 'AA', 'Length (Multiplied)': 6}, {'Time': 2, 'Word': 'AAC', 'Length (Multiplied)': 9}, {'Time': 3, 'Word': 'AACD', 'Length (Multiplied)': 12}, {'Time': 4, 'Word': 'AACDAC', 'Length (Multiplied)': 18}, {'Time': 5, 'Word': 'AACDACB', 'Length (Multiplied)': 21}, {'Time': 6, 'Word': 'AACDACBF', 'Length (Multiplied)': 24}]}, {'Dummy': {'Words': 'AACDACBFAABD', 'Total Length': 36}, 'Time': 9, 'Simulation Log': [{'Time': 1, 'Word': 'AA', 'Length (Multiplied)': 6}, {'Time': 2, 'Word': 'AAC', 'Length (Multiplied)': 9}, {'Time': 3, 'Word': 'AACD', 'Length (Multiplied)': 12}, {'Time': 4, 'Word': 'AACDAC', 'Length (Multiplied)': 18}, {'Time': 5, 'Word': 'AACDACB', 'Length (Multiplied)': 21}, {'Time': 6, 'Word': 'AACDACBF', 'Length (Multiplied)': 24}, {'Time': 7, 'Word': 'AACDACBFAA', 'Length (Multiplied)': 30}, {'Time': 8, 'Word': 'AACDACBFAAB', 'Length (Multiplied)': 33}, {'Time': 9, 'Word': 'AACDACBFAABD', 'Length (Multiplied)': 36}]}]]\n",
189196
"2\n",
190197
"4\n"
191198
]

‎notebooks/Experiment Simulations.ipynb

Lines changed: 30 additions & 22 deletions
Large diffs are not rendered by default.

‎notebooks/Implementation Playground.ipynb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"name": "stdout",
5555
"output_type": "stream",
5656
"text": [
57-
"[{'string': 'E'}]\n"
57+
"[{'string': 'D'}]\n"
5858
]
5959
}
6060
],
@@ -106,7 +106,7 @@
106106
"name": "stdout",
107107
"output_type": "stream",
108108
"text": [
109-
"[{'string': 'D', 'unique_length': 1, 'length': 3}]\n"
109+
"[{'string': 'E', 'unique_length': 1, 'length': 3}]\n"
110110
]
111111
}
112112
],
@@ -134,10 +134,10 @@
134134
"output_type": "stream",
135135
"text": [
136136
"State Before:\n",
137-
"{'Dummy': {'Words': '', 'Total Length': 0}, 'Time': 0, 'Simulation Log': [], 'Stateful Metrics': {'DUMMY Nominal Length Stateful Metric': <function dummy_metric at 0x136f745e0>}, 'Metrics': {'DUMMY Multiplied Length Metric': <function dummy_multiplied_length_metric at 0x136f74860>}}\n",
137+
"{'Dummy': {'Words': '', 'Total Length': 0}, 'Time': 0, 'Simulation Log': [], 'Stateful Metrics': {'DUMMY Nominal Length Stateful Metric': <function dummy_metric at 0x1378f8540>}, 'Metrics': {'DUMMY Multiplied Length Metric': <function dummy_multiplied_length_metric at 0x1378f87c0>}}\n",
138138
"\n",
139139
"State After:\n",
140-
"{'Dummy': {'Words': 'F', 'Total Length': 3}, 'Time': 0, 'Simulation Log': [], 'Stateful Metrics': {'DUMMY Nominal Length Stateful Metric': <function dummy_metric at 0x136f745e0>}, 'Metrics': {'DUMMY Multiplied Length Metric': <function dummy_multiplied_length_metric at 0x136f74860>}}\n"
140+
"{'Dummy': {'Words': 'F', 'Total Length': 3}, 'Time': 0, 'Simulation Log': [], 'Stateful Metrics': {'DUMMY Nominal Length Stateful Metric': <function dummy_metric at 0x1378f8540>}, 'Metrics': {'DUMMY Multiplied Length Metric': <function dummy_multiplied_length_metric at 0x1378f87c0>}}\n"
141141
]
142142
}
143143
],
@@ -212,10 +212,10 @@
212212
"output_type": "stream",
213213
"text": [
214214
"State Before:\n",
215-
"{'Dummy': {'Words': '', 'Total Length': 0}, 'Time': 0, 'Simulation Log': [], 'Stateful Metrics': {'DUMMY Nominal Length Stateful Metric': <function dummy_metric at 0x136f745e0>}, 'Metrics': {'DUMMY Multiplied Length Metric': <function dummy_multiplied_length_metric at 0x136f74860>}}\n",
215+
"{'Dummy': {'Words': '', 'Total Length': 0}, 'Time': 0, 'Simulation Log': [], 'Stateful Metrics': {'DUMMY Nominal Length Stateful Metric': <function dummy_metric at 0x1378f8540>}, 'Metrics': {'DUMMY Multiplied Length Metric': <function dummy_multiplied_length_metric at 0x1378f87c0>}}\n",
216216
"\n",
217217
"State After:\n",
218-
"{'Dummy': {'Words': 'E', 'Total Length': 3}, 'Time': 1, 'Simulation Log': [{'Time': 1, 'Word': 'E', 'Length (Multiplied)': 3}], 'Stateful Metrics': {'DUMMY Nominal Length Stateful Metric': <function dummy_metric at 0x136f745e0>}, 'Metrics': {'DUMMY Multiplied Length Metric': <function dummy_multiplied_length_metric at 0x136f74860>}}\n"
218+
"{'Dummy': {'Words': 'F', 'Total Length': 3}, 'Time': 1, 'Simulation Log': [{'Time': 1, 'Word': 'F', 'Length (Multiplied)': 3}], 'Stateful Metrics': {'DUMMY Nominal Length Stateful Metric': <function dummy_metric at 0x1378f8540>}, 'Metrics': {'DUMMY Multiplied Length Metric': <function dummy_multiplied_length_metric at 0x1378f87c0>}}\n"
219219
]
220220
}
221221
],

0 commit comments

Comments
 (0)