Skip to content

Commit f4e373c

Browse files
SeanMcOwenSeanMcOwen
authored
Merge pull request #616 from BlockScience/0.4.1
0.4.1
2 parents 99a29f8 + 0b24416 commit f4e373c

File tree

11 files changed

+510
-6
lines changed

11 files changed

+510
-6
lines changed

‎dev/Multiprocessing POC/Multiprocessing POC.ipynb‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
{
2+
"cells": [
3+
{
4+
"cell_type": "code",
5+
"execution_count": 2,
6+
"metadata": {},
7+
"outputs": [
8+
{
9+
"name": "stdout",
10+
"output_type": "stream",
11+
"text": [
12+
"[1, 4, 9]\n"
13+
]
14+
}
15+
],
16+
"source": [
17+
"from multiprocessing import Pool\n",
18+
"from functions import f\n",
19+
"\n",
20+
"\n",
21+
"with Pool(5) as p:\n",
22+
" print(p.map(f, [1, 2, 3]))"
23+
]
24+
},
25+
{
26+
"cell_type": "code",
27+
"execution_count": null,
28+
"metadata": {},
29+
"outputs": [],
30+
"source": []
31+
}
32+
],
33+
"metadata": {
34+
"kernelspec": {
35+
"display_name": "BlockScience",
36+
"language": "python",
37+
"name": "python3"
38+
},
39+
"language_info": {
40+
"codemirror_mode": {
41+
"name": "ipython",
42+
"version": 3
43+
},
44+
"file_extension": ".py",
45+
"mimetype": "text/x-python",
46+
"name": "python",
47+
"nbconvert_exporter": "python",
48+
"pygments_lexer": "ipython3",
49+
"version": "3.9.12"
50+
}
51+
},
52+
"nbformat": 4,
53+
"nbformat_minor": 2
54+
}

‎dev/Multiprocessing POC/functions.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
def f(x):
2+
return x * x

‎dev/cadCAD Scratch/.obsidian/app.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

‎dev/cadCAD Scratch/.obsidian/appearance.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

‎dev/cadCAD Scratch/.obsidian/core-plugins.json‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"file-explorer": true,
3+
"global-search": true,
4+
"switcher": true,
5+
"graph": true,
6+
"backlink": true,
7+
"canvas": true,
8+
"outgoing-link": true,
9+
"tag-pane": true,
10+
"properties": false,
11+
"page-preview": true,
12+
"daily-notes": true,
13+
"templates": true,
14+
"note-composer": true,
15+
"command-palette": true,
16+
"slash-command": false,
17+
"editor-status": true,
18+
"bookmarks": true,
19+
"markdown-importer": false,
20+
"zk-prefixer": false,
21+
"random-note": false,
22+
"outline": true,
23+
"word-count": true,
24+
"slides": false,
25+
"audio-recorder": false,
26+
"workspaces": false,
27+
"file-recovery": true,
28+
"publish": false,
29+
"sync": false
30+
}

‎dev/cadCAD Scratch/.obsidian/workspace.json‎

Lines changed: 173 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,173 @@
1+
{
2+
"main": {
3+
"id": "ebb1f7af23941637",
4+
"type": "split",
5+
"children": [
6+
{
7+
"id": "568d45caa507431d",
8+
"type": "tabs",
9+
"children": [
10+
{
11+
"id": "104134b1d981b567",
12+
"type": "leaf",
13+
"state": {
14+
"type": "canvas",
15+
"state": {
16+
"file": "MSML cadCAD Architecture.canvas",
17+
"viewState": {
18+
"x": 173.7321486342915,
19+
"y": 92.17958112430901,
20+
"zoom": -0.2988097469011942
21+
}
22+
},
23+
"icon": "lucide-layout-dashboard",
24+
"title": "MSML cadCAD Architecture"
25+
}
26+
}
27+
]
28+
}
29+
],
30+
"direction": "vertical"
31+
},
32+
"left": {
33+
"id": "e73f36936028d6e3",
34+
"type": "split",
35+
"children": [
36+
{
37+
"id": "029ed6d83ddc23dd",
38+
"type": "tabs",
39+
"children": [
40+
{
41+
"id": "fe4ee760909ef1a7",
42+
"type": "leaf",
43+
"state": {
44+
"type": "file-explorer",
45+
"state": {
46+
"sortOrder": "alphabetical"
47+
},
48+
"icon": "lucide-folder-closed",
49+
"title": "Files"
50+
}
51+
},
52+
{
53+
"id": "b005d680dfdcd155",
54+
"type": "leaf",
55+
"state": {
56+
"type": "search",
57+
"state": {
58+
"query": "",
59+
"matchingCase": false,
60+
"explainSearch": false,
61+
"collapseAll": false,
62+
"extraContext": false,
63+
"sortOrder": "alphabetical"
64+
},
65+
"icon": "lucide-search",
66+
"title": "Search"
67+
}
68+
},
69+
{
70+
"id": "8bbe726fc7efc331",
71+
"type": "leaf",
72+
"state": {
73+
"type": "bookmarks",
74+
"state": {},
75+
"icon": "lucide-bookmark",
76+
"title": "Bookmarks"
77+
}
78+
}
79+
]
80+
}
81+
],
82+
"direction": "horizontal",
83+
"width": 300
84+
},
85+
"right": {
86+
"id": "a1ed7db625cdcfe6",
87+
"type": "split",
88+
"children": [
89+
{
90+
"id": "7dc8de8390d07cad",
91+
"type": "tabs",
92+
"children": [
93+
{
94+
"id": "9391e977b1f9e192",
95+
"type": "leaf",
96+
"state": {
97+
"type": "backlink",
98+
"state": {
99+
"file": "MSML cadCAD Architecture.canvas",
100+
"collapseAll": false,
101+
"extraContext": false,
102+
"sortOrder": "alphabetical",
103+
"showSearch": false,
104+
"searchQuery": "",
105+
"backlinkCollapsed": false,
106+
"unlinkedCollapsed": true
107+
},
108+
"icon": "links-coming-in",
109+
"title": "Backlinks for MSML cadCAD Architecture"
110+
}
111+
},
112+
{
113+
"id": "de8681df02472c23",
114+
"type": "leaf",
115+
"state": {
116+
"type": "outgoing-link",
117+
"state": {
118+
"file": "MSML cadCAD Architecture.canvas",
119+
"linksCollapsed": false,
120+
"unlinkedCollapsed": true
121+
},
122+
"icon": "links-going-out",
123+
"title": "Outgoing links from MSML cadCAD Architecture"
124+
}
125+
},
126+
{
127+
"id": "e2678bce3695cc31",
128+
"type": "leaf",
129+
"state": {
130+
"type": "tag",
131+
"state": {
132+
"sortOrder": "frequency",
133+
"useHierarchy": true
134+
},
135+
"icon": "lucide-tags",
136+
"title": "Tags"
137+
}
138+
},
139+
{
140+
"id": "5439647b15bdca32",
141+
"type": "leaf",
142+
"state": {
143+
"type": "outline",
144+
"state": {
145+
"file": "MSML cadCAD Architecture.canvas"
146+
},
147+
"icon": "lucide-list",
148+
"title": "Outline of MSML cadCAD Architecture"
149+
}
150+
}
151+
]
152+
}
153+
],
154+
"direction": "horizontal",
155+
"width": 300,
156+
"collapsed": true
157+
},
158+
"left-ribbon": {
159+
"hiddenItems": {
160+
"switcher:Open quick switcher": false,
161+
"graph:Open graph view": false,
162+
"canvas:Create new canvas": false,
163+
"daily-notes:Open today's daily note": false,
164+
"templates:Insert template": false,
165+
"command-palette:Open command palette": false
166+
}
167+
},
168+
"active": "104134b1d981b567",
169+
"lastOpenFiles": [
170+
"Untitled.md",
171+
"MSML cadCAD Architecture.canvas"
172+
]
173+
}

‎dev/cadCAD Scratch/MSML cadCAD Architecture.canvas‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"nodes":[
3+
{"id":"a6d1c3438e3eb4e1","x":280,"y":-280,"width":500,"height":640,"type":"group","label":"cadCAD User View"},
4+
{"id":"b70dd39c3d751786","x":-100,"y":-280,"width":360,"height":580,"type":"group","label":"MSML-cadCAD Bridge Outputs"},
5+
{"id":"a66ae27ec1859b01","x":-420,"y":-280,"width":260,"height":580,"type":"group","label":"MSML Dev View"},
6+
{"id":"0c7ae0c823c829a9","x":-400,"y":-260,"width":220,"height":60,"type":"text","text":"MSML Object"},
7+
{"id":"bbb1312697692952","x":-80,"y":-260,"width":240,"height":140,"type":"text","text":"cadCAD Model\n- Acts as a factory for generating experiments"},
8+
{"id":"8e9e9cd0f2ed4507","x":-400,"y":160,"width":220,"height":120,"type":"text","text":"Blocks (Dynamics) -Will execute all sequentially for one \"step\" in MVP"},
9+
{"id":"317162b129f622fd","x":-400,"y":80,"width":220,"height":60,"type":"text","text":"Parameter Preparation Functions"},
10+
{"id":"cac35864b7b623bd","x":-400,"y":-20,"width":220,"height":80,"type":"text","text":"State Preparation Functions"},
11+
{"id":"0a251eec55fbadaf","x":-400,"y":-150,"width":220,"height":70,"type":"text","text":"build_cadCAD(...)"},
12+
{"id":"7a45b3e55b34f1a1","x":-40,"y":80,"width":250,"height":60,"type":"text","text":"State Space - Dictionary of state variables + types"},
13+
{"id":"83ac341b0997ed52","x":-40,"y":180,"width":250,"height":60,"type":"text","text":"Parameter Space"},
14+
{"id":"73de437b0ce0b423","x":-85,"y":-40,"width":250,"height":60,"type":"text","text":"build_experiment(state, parameters)"},
15+
{"id":"eed778cc1965413f","x":360,"y":-260,"width":250,"height":60,"type":"text","text":"Writes state with type of StateSpace"},
16+
{"id":"7a2060681be96243","x":360,"y":-175,"width":250,"height":60,"type":"text","text":"Writes parameters with type of ParameterSpace"},
17+
{"id":"e1005f3dcf8fd223","x":360,"y":-70,"width":250,"height":180,"type":"text","text":"ExperimentObject\n- At init, sets parameter and state variable of object and runs state prep and param prep if present"},
18+
{"id":"0fc9eb986c037b77","x":540,"y":190,"width":220,"height":150,"type":"text","text":"Run\n- State updated w/ multiple runs\n- Option to log all trajectory in list"},
19+
{"id":"dd3b639fb23c6a14","x":300,"y":190,"width":185,"height":150,"type":"text","text":"Step\n- State updated w/ one run"}
20+
],
21+
"edges":[
22+
{"id":"e26408cf783df197","fromNode":"0c7ae0c823c829a9","fromSide":"bottom","toNode":"0a251eec55fbadaf","toSide":"top","label":"class function"},
23+
{"id":"1ef5bc8548306642","fromNode":"cac35864b7b623bd","fromSide":"left","toNode":"0a251eec55fbadaf","toSide":"left"},
24+
{"id":"3bce4a56fce2ce4f","fromNode":"8e9e9cd0f2ed4507","fromSide":"left","toNode":"0a251eec55fbadaf","toSide":"left"},
25+
{"id":"43ed4e3de30ccb1a","fromNode":"317162b129f622fd","fromSide":"left","toNode":"0a251eec55fbadaf","toSide":"left"},
26+
{"id":"3a34b35e83d033fe","fromNode":"0a251eec55fbadaf","fromSide":"right","toNode":"bbb1312697692952","toSide":"left"},
27+
{"id":"fd0fa4f5e8ee691a","fromNode":"0a251eec55fbadaf","fromSide":"right","toNode":"7a45b3e55b34f1a1","toSide":"left"},
28+
{"id":"6fa7f5ea7310aecc","fromNode":"0a251eec55fbadaf","fromSide":"right","toNode":"83ac341b0997ed52","toSide":"left"},
29+
{"id":"5faa2e303bc57a8a","fromNode":"bbb1312697692952","fromSide":"bottom","toNode":"73de437b0ce0b423","toSide":"top","label":"class function"},
30+
{"id":"810922f3beef1a5a","fromNode":"83ac341b0997ed52","fromSide":"right","toNode":"7a2060681be96243","toSide":"right"},
31+
{"id":"a6454fc03296dd06","fromNode":"7a45b3e55b34f1a1","fromSide":"right","toNode":"eed778cc1965413f","toSide":"right"},
32+
{"id":"75eae6f79f689eb8","fromNode":"7a2060681be96243","fromSide":"left","toNode":"73de437b0ce0b423","toSide":"right"},
33+
{"id":"daeae34e4a7c0624","fromNode":"eed778cc1965413f","fromSide":"left","toNode":"73de437b0ce0b423","toSide":"right"},
34+
{"id":"52f937f41817fbf3","fromNode":"73de437b0ce0b423","fromSide":"right","toNode":"e1005f3dcf8fd223","toSide":"left"},
35+
{"id":"02a6b575176162d1","fromNode":"e1005f3dcf8fd223","fromSide":"bottom","toNode":"dd3b639fb23c6a14","toSide":"top","label":"Class Fx"},
36+
{"id":"26d6af604c11e792","fromNode":"e1005f3dcf8fd223","fromSide":"bottom","toNode":"0fc9eb986c037b77","toSide":"top","label":"Class Fx"}
37+
]
38+
}

‎pyproject.toml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,19 @@ requires = ["setuptools>=61.0"]
33
build-backend = "setuptools.build_meta"
44
[project]
55
name = "math-spec-mapping"
6-
version = "0.4.0"
6+
version = "0.4.1"
77
authors = [
88
{ name="Sean McOwen", email="[email protected]" },
99
]
1010
description = "A library for easy mapping of mathematical specifications."
1111
dependencies = [
1212
"graphviz>=0.20.1",
1313
"ipython>=7.7.0",
14-
"pandas>=1.4"
14+
"pandas>=1.4",
15+
"jsonschema>=4.21.1",
16+
"PyGithub==2.5.0",
17+
"dotenv",
18+
"python-dotenv>=1.0.0"
1519
]
1620
readme = "README.md"
1721
requires-python = ">=3.7"

‎requirements.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ graphviz>=0.20.1
22
ipython>=7.7.0
33
pandas>=1.4
44
jsonschema>=4.21.1
5-
PyGithub=2.5.0
6-
dotenv
5+
PyGithub==2.5.0
6+
python-dotenv>=1.0.0

0 commit comments

Comments
 (0)