Skip to content

Commit 658d036

Browse files
AadilLatifAadilLatif
authored
Merge pull request #101 from NREL-Distribution-Suites/al/storage_model
doc bug
2 parents 04c6b9b + 8f5d346 commit 658d036

File tree

1 file changed

+30
-37
lines changed

1 file changed

+30
-37
lines changed

‎docs/dist_system/tracked_changes.ipynb‎

Lines changed: 30 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
{
1616
"cell_type": "code",
17-
"execution_count": null,
17+
"execution_count": 1,
1818
"metadata": {},
1919
"outputs": [
2020
{
@@ -25,7 +25,7 @@
2525
"┃<span style=\"font-weight: bold\"> Property </span>┃<span style=\"font-weight: bold\"> Value </span>┃\n",
2626
"┡━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━┩\n",
2727
"│ System name │ │\n",
28-
"│ Data format version │ 2.0.0 │\n",
28+
"│ Data format version │ 2.1.3 │\n",
2929
"│ Components attached │ 437 │\n",
3030
"│ Time Series attached │ 0 │\n",
3131
"│ Description │ │\n",
@@ -38,7 +38,7 @@
3838
"┃\u001b[1m \u001b[0m\u001b[1mProperty \u001b[0m\u001b[1m \u001b[0m┃\u001b[1m \u001b[0m\u001b[1mValue\u001b[0m\u001b[1m \u001b[0m┃\n",
3939
"┡━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━┩\n",
4040
"│ System name │ │\n",
41-
"│ Data format version │ 2.0.0 │\n",
41+
"│ Data format version │ 2.1.3 │\n",
4242
"│ Components attached │ 437 │\n",
4343
"│ Time Series attached │ 0 │\n",
4444
"│ Description │ │\n",
@@ -125,7 +125,7 @@
125125
},
126126
{
127127
"cell_type": "code",
128-
"execution_count": 3,
128+
"execution_count": 5,
129129
"metadata": {},
130130
"outputs": [],
131131
"source": [
@@ -151,7 +151,7 @@
151151
},
152152
{
153153
"cell_type": "code",
154-
"execution_count": 7,
154+
"execution_count": 6,
155155
"metadata": {},
156156
"outputs": [],
157157
"source": [
@@ -185,7 +185,7 @@
185185
},
186186
{
187187
"cell_type": "code",
188-
"execution_count": 18,
188+
"execution_count": 7,
189189
"metadata": {},
190190
"outputs": [],
191191
"source": [
@@ -195,7 +195,7 @@
195195
"system_changes = [\n",
196196
" TrackedChange(\n",
197197
" scenario_name=\"scenario_1\",\n",
198-
" update_date=\"2022-01-01\",\n",
198+
" timestamp=\"2022-01-01 00:00:00\",\n",
199199
" edits=[\n",
200200
" PropertyEdit(\n",
201201
" component_uuid=line.uuid,\n",
@@ -206,17 +206,17 @@
206206
" ),\n",
207207
" TrackedChange(\n",
208208
" scenario_name=\"scenario_1\",\n",
209-
" update_date=\"2023-01-01\",\n",
209+
" timestamp=\"2023-01-01 00:00:00\",\n",
210210
" additions=[\"aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa\"],\n",
211211
" ),\n",
212212
" TrackedChange(\n",
213213
" scenario_name=\"scenario_1\",\n",
214-
" update_date=\"2024-01-01\",\n",
214+
" timestamp=\"2024-01-01 00:00:00\",\n",
215215
" deletions=[load1.uuid],\n",
216216
" ),\n",
217217
" TrackedChange(\n",
218218
" scenario_name=\"scenario_2\",\n",
219-
" update_date=\"2025-01-01\",\n",
219+
" timestamp=\"2025-01-01 00:00:00\",\n",
220220
" deletions=[load2.uuid],\n",
221221
" ),\n",
222222
"]"
@@ -231,7 +231,7 @@
231231
},
232232
{
233233
"cell_type": "code",
234-
"execution_count": 19,
234+
"execution_count": 8,
235235
"metadata": {},
236236
"outputs": [],
237237
"source": [
@@ -241,7 +241,7 @@
241241
"tracked_changes = filter_tracked_changes_by_name_and_date(\n",
242242
" system_changes,\n",
243243
" scenario_name=\"scenario_1\",\n",
244-
" update_date=datetime.strptime(\"2022-1-1\", \"%Y-%m-%d\").date(),\n",
244+
" timestamp=datetime.strptime(\"2022-1-1\", \"%Y-%m-%d\"),\n",
245245
")"
246246
]
247247
},
@@ -254,29 +254,29 @@
254254
},
255255
{
256256
"cell_type": "code",
257-
"execution_count": null,
257+
"execution_count": 9,
258258
"metadata": {},
259259
"outputs": [
260260
{
261261
"data": {
262262
"text/html": [
263263
"<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"><span style=\"font-style: italic\"> Updates applied to the system </span>\n",
264-
"┏━━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━┳━━━━━━━━━━━━┓\n",
265-
"┃<span style=\"font-weight: bold\"> Timestamp </span>┃<span style=\"font-weight: bold\"> Operation </span>┃<span style=\"font-weight: bold\"> UUID </span>┃<span style=\"font-weight: bold\"> Component Type </span>┃<span style=\"font-weight: bold\"> Component Name </span>┃<span style=\"font-weight: bold\"> Connected bus </span>┃<span style=\"font-weight: bold\"> Scenario </span>┃\n",
266-
"┡━━━━━━━━━━━━╇━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━╇━━━━━━━━━━━━┩\n",
267-
"│<span style=\"color: #008080; text-decoration-color: #008080\"> 2022-01-01 </span>│<span style=\"color: #800080; text-decoration-color: #800080\"> Edit </span>│<span style=\"color: #ff00ff; text-decoration-color: #ff00ff\"> 8f98b0f7-e4ff-4a… </span>│<span style=\"color: #008080; text-decoration-color: #008080\"> MatrixImpedanceB… </span>│<span style=\"color: #008000; text-decoration-color: #008000\"> sourcebus_connec… </span>│<span style=\"color: #ff0000; text-decoration-color: #ff0000\"> sourcebus </span>│<span style=\"color: #00d7ff; text-decoration-color: #00d7ff\"> scenario_1 </span>│\n",
268-
"│<span style=\"color: #008080; text-decoration-color: #008080\"> </span>│<span style=\"color: #800080; text-decoration-color: #800080\"> </span>│<span style=\"color: #ff00ff; text-decoration-color: #ff00ff\"> </span>│<span style=\"color: #008080; text-decoration-color: #008080\"> </span>│<span style=\"color: #008000; text-decoration-color: #008000\"> </span>│<span style=\"color: #ff0000; text-decoration-color: #ff0000\"> connector </span>│<span style=\"color: #00d7ff; text-decoration-color: #00d7ff\"> </span>│\n",
269-
"└────────────┴───────────┴───────────────────┴───────────────────┴───────────────────┴───────────────┴────────────┘\n",
264+
"┏━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━┳━━━━━━━━━━━━┓\n",
265+
"┃<span style=\"font-weight: bold\"> Timestamp </span>┃<span style=\"font-weight: bold\"> Operation </span>┃<span style=\"font-weight: bold\"> UUID </span>┃<span style=\"font-weight: bold\"> Component Type </span>┃<span style=\"font-weight: bold\"> Component Name </span>┃<span style=\"font-weight: bold\"> Connected bus </span>┃<span style=\"font-weight: bold\"> Scenario </span>┃\n",
266+
"┡━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━╇━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━╇━━━━━━━━━━━━┩\n",
267+
"│<span style=\"color: #008080; text-decoration-color: #008080\"> 2022-01-01 00:00:00 </span>│<span style=\"color: #800080; text-decoration-color: #800080\"> Edit </span>│<span style=\"color: #ff00ff; text-decoration-color: #ff00ff\"> 708915df-8348… </span>│<span style=\"color: #008080; text-decoration-color: #008080\"> MatrixImpedan… </span>│<span style=\"color: #008000; text-decoration-color: #008000\"> sourcebus_con… </span>│<span style=\"color: #ff0000; text-decoration-color: #ff0000\"> sourcebus </span>│<span style=\"color: #00d7ff; text-decoration-color: #00d7ff\"> scenario_1 </span>│\n",
268+
"│<span style=\"color: #008080; text-decoration-color: #008080\"> </span>│<span style=\"color: #800080; text-decoration-color: #800080\"> </span>│<span style=\"color: #ff00ff; text-decoration-color: #ff00ff\"> </span>│<span style=\"color: #008080; text-decoration-color: #008080\"> </span>│<span style=\"color: #008000; text-decoration-color: #008000\"> </span>│<span style=\"color: #ff0000; text-decoration-color: #ff0000\"> connector </span>│<span style=\"color: #00d7ff; text-decoration-color: #00d7ff\"> </span>│\n",
269+
"└─────────────────────┴───────────┴────────────────┴────────────────┴────────────────┴───────────────┴────────────┘\n",
270270
"</pre>\n"
271271
],
272272
"text/plain": [
273273
"\u001b[3m Updates applied to the system \u001b[0m\n",
274-
"┏━━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━┳━━━━━━━━━━━━┓\n",
275-
"┃\u001b[1m \u001b[0m\u001b[1m Timestamp\u001b[0m\u001b[1m \u001b[0m┃\u001b[1m \u001b[0m\u001b[1mOperation\u001b[0m\u001b[1m \u001b[0m┃\u001b[1m \u001b[0m\u001b[1m UUID\u001b[0m\u001b[1m \u001b[0m┃\u001b[1m \u001b[0m\u001b[1m Component Type\u001b[0m\u001b[1m \u001b[0m┃\u001b[1m \u001b[0m\u001b[1m Component Name\u001b[0m\u001b[1m \u001b[0m┃\u001b[1m \u001b[0m\u001b[1mConnected bus\u001b[0m\u001b[1m \u001b[0m┃\u001b[1m \u001b[0m\u001b[1m Scenario\u001b[0m\u001b[1m \u001b[0m┃\n",
276-
"┡━━━━━━━━━━━━╇━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━╇━━━━━━━━━━━━┩\n",
277-
"│\u001b[36m \u001b[0m\u001b[36m2022-01-01\u001b[0m\u001b[36m \u001b[0m│\u001b[35m \u001b[0m\u001b[35mEdit \u001b[0m\u001b[35m \u001b[0m│\u001b[95m \u001b[0m\u001b[95m8f98b0f7-e4ff-4a…\u001b[0m\u001b[95m \u001b[0m│\u001b[36m \u001b[0m\u001b[36mMatrixImpedanceB…\u001b[0m\u001b[36m \u001b[0m│\u001b[32m \u001b[0m\u001b[32msourcebus_connec…\u001b[0m\u001b[32m \u001b[0m│\u001b[91m \u001b[0m\u001b[91m sourcebus\u001b[0m\u001b[91m \u001b[0m│\u001b[38;5;45m \u001b[0m\u001b[38;5;45mscenario_1\u001b[0m\u001b[38;5;45m \u001b[0m│\n",
278-
"│\u001b[36m \u001b[0m│\u001b[35m \u001b[0m│\u001b[95m \u001b[0m│\u001b[36m \u001b[0m│\u001b[32m \u001b[0m│\u001b[91m \u001b[0m\u001b[91m connector\u001b[0m\u001b[91m \u001b[0m│\u001b[38;5;45m \u001b[0m│\n",
279-
"└────────────┴───────────┴───────────────────┴───────────────────┴───────────────────┴───────────────┴────────────┘\n"
274+
"┏━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━┳━━━━━━━━━━━━┓\n",
275+
"┃\u001b[1m \u001b[0m\u001b[1m Timestamp\u001b[0m\u001b[1m \u001b[0m┃\u001b[1m \u001b[0m\u001b[1mOperation\u001b[0m\u001b[1m \u001b[0m┃\u001b[1m \u001b[0m\u001b[1m UUID\u001b[0m\u001b[1m \u001b[0m┃\u001b[1m \u001b[0m\u001b[1mComponent Type\u001b[0m\u001b[1m \u001b[0m┃\u001b[1m \u001b[0m\u001b[1mComponent Name\u001b[0m\u001b[1m \u001b[0m┃\u001b[1m \u001b[0m\u001b[1mConnected bus\u001b[0m\u001b[1m \u001b[0m┃\u001b[1m \u001b[0m\u001b[1m Scenario\u001b[0m\u001b[1m \u001b[0m┃\n",
276+
"┡━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━╇━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━╇━━━━━━━━━━━━┩\n",
277+
"│\u001b[36m \u001b[0m\u001b[36m2022-01-01 00:00:00\u001b[0m\u001b[36m \u001b[0m│\u001b[35m \u001b[0m\u001b[35mEdit \u001b[0m\u001b[35m \u001b[0m│\u001b[95m \u001b[0m\u001b[95m708915df-8348…\u001b[0m\u001b[95m \u001b[0m│\u001b[36m \u001b[0m\u001b[36mMatrixImpedan…\u001b[0m\u001b[36m \u001b[0m│\u001b[32m \u001b[0m\u001b[32msourcebus_con…\u001b[0m\u001b[32m \u001b[0m│\u001b[91m \u001b[0m\u001b[91m sourcebus\u001b[0m\u001b[91m \u001b[0m│\u001b[38;5;45m \u001b[0m\u001b[38;5;45mscenario_1\u001b[0m\u001b[38;5;45m \u001b[0m│\n",
278+
"│\u001b[36m \u001b[0m│\u001b[35m \u001b[0m│\u001b[95m \u001b[0m│\u001b[36m \u001b[0m│\u001b[32m \u001b[0m│\u001b[91m \u001b[0m\u001b[91m connector\u001b[0m\u001b[91m \u001b[0m│\u001b[38;5;45m \u001b[0m│\n",
279+
"└─────────────────────┴───────────┴────────────────┴────────────────┴────────────────┴───────────────┴────────────┘\n"
280280
]
281281
},
282282
"metadata": {},
@@ -295,7 +295,7 @@
295295
},
296296
{
297297
"cell_type": "code",
298-
"execution_count": 21,
298+
"execution_count": 10,
299299
"metadata": {},
300300
"outputs": [
301301
{
@@ -306,7 +306,7 @@
306306
"┃<span style=\"font-weight: bold\"> Property </span>┃<span style=\"font-weight: bold\"> Value </span>┃\n",
307307
"┡━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━┩\n",
308308
"│ System name │ │\n",
309-
"│ Data format version │ 2.0.0 │\n",
309+
"│ Data format version │ 2.1.3 │\n",
310310
"│ Components attached │ 437 │\n",
311311
"│ Time Series attached │ 0 │\n",
312312
"│ Description │ │\n",
@@ -319,7 +319,7 @@
319319
"┃\u001b[1m \u001b[0m\u001b[1mProperty \u001b[0m\u001b[1m \u001b[0m┃\u001b[1m \u001b[0m\u001b[1mValue\u001b[0m\u001b[1m \u001b[0m┃\n",
320320
"┡━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━┩\n",
321321
"│ System name │ │\n",
322-
"│ Data format version │ 2.0.0 │\n",
322+
"│ Data format version │ 2.1.3 │\n",
323323
"│ Components attached │ 437 │\n",
324324
"│ Time Series attached │ 0 │\n",
325325
"│ Description │ │\n",
@@ -398,7 +398,7 @@
398398
},
399399
{
400400
"cell_type": "code",
401-
"execution_count": 22,
401+
"execution_count": null,
402402
"metadata": {},
403403
"outputs": [
404404
{
@@ -533,18 +533,11 @@
533533
")\n",
534534
"new_system.info()"
535535
]
536-
},
537-
{
538-
"cell_type": "code",
539-
"execution_count": null,
540-
"metadata": {},
541-
"outputs": [],
542-
"source": []
543536
}
544537
],
545538
"metadata": {
546539
"kernelspec": {
547-
"display_name": "gdm2",
540+
"display_name": "gdm",
548541
"language": "python",
549542
"name": "python3"
550543
},

0 commit comments

Comments
 (0)