Skip to content

Commit 610af90

Browse files
authored
Merge branch 'main' into feat/add-uv-support
Signed-off-by: Martijn Govers <[email protected]>
2 parents 7bd3bed + a515f4d commit 610af90

File tree

63 files changed

+3103
-635
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+3103
-635
lines changed

.github/workflows/sync-examples.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,3 @@ jobs:
4949
commit_user_name: GitHub Actions Bot
5050
commit_user_email: [email protected]
5151
commit_author: GitHub Actions Bot <[email protected]>
52-
53-
keepalive-job:
54-
name: Keepalive Workflow
55-
runs-on: ubuntu-latest
56-
permissions:
57-
actions: write
58-
steps:
59-
- uses: actions/checkout@v4
60-
- uses: gautamkrishnar/keepalive-workflow@v2

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ It is recommended to read the numpy structured array
2424
Please create the relevant environment before the workshop. If you encounter problems, please raise a question in the [discussion board](https://github.com/orgs/PowerGridModel/discussions)
2525

2626
### Preparation with uv (Windows/Mac/Linux)
27+
2728
1. Open a terminal
2829
- Windows: Press `Windows-Key + R`, type `cmd`, press **OK**
2930
- Mac/Linux: Open a terminal
@@ -64,6 +65,7 @@ for your operating system (Windows/Mac/Linux)
6465
http://localhost:8888. If not, the console output will tell you where to find the jupyter notebook server.
6566
```shell
6667
uv run jupyter notebook
68+
```
6769
6870
## License
6971

examples/Asymmetric Calculation Example.ipynb

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,16 @@
4848
"import numpy as np\n",
4949
"import pandas as pd\n",
5050
"\n",
51-
"from power_grid_model import LoadGenType, ComponentType, DatasetType\n",
52-
"from power_grid_model import PowerGridModel, CalculationMethod, CalculationType, MeasuredTerminalType\n",
53-
"from power_grid_model import initialize_array"
51+
"from power_grid_model import (\n",
52+
" CalculationMethod,\n",
53+
" CalculationType,\n",
54+
" ComponentType,\n",
55+
" DatasetType,\n",
56+
" LoadGenType,\n",
57+
" MeasuredTerminalType,\n",
58+
" PowerGridModel,\n",
59+
" initialize_array,\n",
60+
")"
5461
]
5562
},
5663
{
@@ -317,7 +324,7 @@
317324
"source": [
318325
"#### Accessing batch data\n",
319326
"\n",
320-
"It may be a bit unintuitive to read the `output_data` or `update_data` of a component directly as they are a dictionary of 4 dimension data, ie. $ids \\times batches \\times attributes \\times phases$. Remember that the `output_data` or `update_data` are a dictionary of numpy structured arrays. Hence the component should be indexed first. The index that follows can be [indexed with numpy structured arrays](https://numpy.org/doc/stable/user/basics.rec.html#indexing-structured-arrays).\n",
327+
"It may be a bit unintuitive to read the `output_data` or `update_data` of a component directly as they are a dictionary of 4 dimension data, i.e., $ids \\times batches \\times attributes \\times phases$. Remember that the `output_data` or `update_data` are a dictionary of numpy structured arrays. Hence the component should be indexed first. The index that follows can be [indexed with numpy structured arrays](https://numpy.org/doc/stable/user/basics.rec.html#indexing-structured-arrays).\n",
321328
"\n",
322329
"To read the result of a single batch, e.g. 1st batch,"
323330
]
@@ -825,7 +832,7 @@
825832
"name": "python",
826833
"nbconvert_exporter": "python",
827834
"pygments_lexer": "ipython3",
828-
"version": "3.13.0"
835+
"version": "3.12.0"
829836
}
830837
},
831838
"nbformat": 4,

0 commit comments

Comments
 (0)