Skip to content

Commit 80768cd

Browse files
committed
complete revise the architecture
1 parent 3cf093a commit 80768cd

20 files changed

Lines changed: 691 additions & 607 deletions

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# Exclude results
2+
/src/results/
3+
/src/result/
4+
15
# Rust build output
26
/target/
37
**/*.rs.bk

Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ ndarray-rand = { version = "0.15.0" }
1111
rayon = "1.10.0"
1212
spreadsheet-ods = "0.25.0"
1313
uuid = "1.17.0"
14+
serde_json = "1.0.140"

notebooks/sm_term_demo.ipynb

Lines changed: 14 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@
1818
"cell_type": "code",
1919
"execution_count": 2,
2020
"id": "e698aab3",
21-
"metadata": {
22-
"vscode": {
23-
"languageId": "rust"
24-
}
25-
},
21+
"metadata": {},
2622
"outputs": [],
2723
"source": [
2824
"// Load dependecies\n",
@@ -42,10 +38,7 @@
4238
"slideshow": {
4339
"slide_type": ""
4440
},
45-
"tags": [],
46-
"vscode": {
47-
"languageId": "rust"
48-
}
41+
"tags": []
4942
},
5043
"outputs": [
5144
{
@@ -131,11 +124,7 @@
131124
"cell_type": "code",
132125
"execution_count": 4,
133126
"id": "d54b6533-c558-4e44-a47e-016b140936f6",
134-
"metadata": {
135-
"vscode": {
136-
"languageId": "rust"
137-
}
138-
},
127+
"metadata": {},
139128
"outputs": [],
140129
"source": [
141130
"// Load all libraries\n",
@@ -174,10 +163,7 @@
174163
"slideshow": {
175164
"slide_type": ""
176165
},
177-
"tags": [],
178-
"vscode": {
179-
"languageId": "rust"
180-
}
166+
"tags": []
181167
},
182168
"outputs": [],
183169
"source": [
@@ -266,11 +252,7 @@
266252
"cell_type": "code",
267253
"execution_count": 6,
268254
"id": "a7a6d8ae-9d5e-4658-9a14-ecf2dc759a76",
269-
"metadata": {
270-
"vscode": {
271-
"languageId": "rust"
272-
}
273-
},
255+
"metadata": {},
274256
"outputs": [],
275257
"source": [
276258
"//---------------------------------------------------------------------------------------------------------\n",
@@ -377,9 +359,6 @@
377359
},
378360
"notebookRunGroups": {
379361
"groupValue": "1"
380-
},
381-
"vscode": {
382-
"languageId": "rust"
383362
}
384363
},
385364
"outputs": [],
@@ -850,11 +829,7 @@
850829
"cell_type": "code",
851830
"execution_count": 8,
852831
"id": "3b7ae121",
853-
"metadata": {
854-
"vscode": {
855-
"languageId": "rust"
856-
}
857-
},
832+
"metadata": {},
858833
"outputs": [],
859834
"source": [
860835
"//---------------------------------------------------------------------------------------------------------\n",
@@ -900,11 +875,7 @@
900875
"cell_type": "code",
901876
"execution_count": 9,
902877
"id": "7f24c65a-d98b-4b2f-ab04-23e4ce4d0e5b",
903-
"metadata": {
904-
"vscode": {
905-
"languageId": "rust"
906-
}
907-
},
878+
"metadata": {},
908879
"outputs": [
909880
{
910881
"data": {
@@ -953,11 +924,7 @@
953924
"cell_type": "code",
954925
"execution_count": 10,
955926
"id": "fb9fcba4-3ccd-4ba2-abae-dcdf5f6cc76a",
956-
"metadata": {
957-
"vscode": {
958-
"languageId": "rust"
959-
}
960-
},
927+
"metadata": {},
961928
"outputs": [
962929
{
963930
"name": "stderr",
@@ -986,11 +953,7 @@
986953
"cell_type": "code",
987954
"execution_count": 11,
988955
"id": "d66260c8",
989-
"metadata": {
990-
"vscode": {
991-
"languageId": "rust"
992-
}
993-
},
956+
"metadata": {},
994957
"outputs": [
995958
{
996959
"name": "stderr",
@@ -1026,11 +989,7 @@
1026989
"cell_type": "code",
1027990
"execution_count": 12,
1028991
"id": "2672a7cc",
1029-
"metadata": {
1030-
"vscode": {
1031-
"languageId": "rust"
1032-
}
1033-
},
992+
"metadata": {},
1034993
"outputs": [
1035994
{
1036995
"ename": "Error",
@@ -1061,11 +1020,7 @@
10611020
"cell_type": "code",
10621021
"execution_count": null,
10631022
"id": "76709d0e",
1064-
"metadata": {
1065-
"vscode": {
1066-
"languageId": "rust"
1067-
}
1068-
},
1023+
"metadata": {},
10691024
"outputs": [],
10701025
"source": [
10711026
"let run_setup_02 = RunSetup {\n",
@@ -1093,10 +1048,7 @@
10931048
"execution_count": null,
10941049
"id": "5a7a7bb3-1389-4fd5-b655-0849a8464ffc",
10951050
"metadata": {
1096-
"scrolled": true,
1097-
"vscode": {
1098-
"languageId": "rust"
1099-
}
1051+
"scrolled": true
11001052
},
11011053
"outputs": [],
11021054
"source": [
@@ -1112,11 +1064,7 @@
11121064
"cell_type": "code",
11131065
"execution_count": null,
11141066
"id": "85c07734",
1115-
"metadata": {
1116-
"vscode": {
1117-
"languageId": "rust"
1118-
}
1119-
},
1067+
"metadata": {},
11201068
"outputs": [],
11211069
"source": [
11221070
"// Premium rates - assume that run 01 is used to obtain premium rates\n",
@@ -1152,7 +1100,7 @@
11521100
"codemirror_mode": "rust",
11531101
"file_extension": ".rs",
11541102
"mimetype": "text/rust",
1155-
"name": "Rust",
1103+
"name": "rust",
11561104
"pygment_lexer": "rust",
11571105
"version": ""
11581106
}

src/assumptions.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
pub mod assumption;
2-
pub mod assumption_set;
1+
mod assumption;
2+
pub mod assumption_scenario;
3+
mod helpers;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
,NTH-ASUS-CODING/ASUS,NTH-ASUS-CODING-LAPTOP,07.07.2025 02:32,file:///C:/Users/ASUS/AppData/Roaming/LibreOffice/4;
1+
,NTH-ASUS-CODING/ASUS,NTH-ASUS-CODING-LAPTOP,07.07.2025 08:39,file:///C:/Users/ASUS/AppData/Roaming/LibreOffice/4;

0 commit comments

Comments
 (0)