Skip to content

Commit 8cdccb5

Browse files
mrzkpteubert
authored andcommitted
Update benchmarking.ipynb
1 parent 7730e61 commit 8cdccb5

File tree

1 file changed

+17
-5
lines changed

1 file changed

+17
-5
lines changed

examples/benchmarking.ipynb

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"cells": [
33
{
44
"cell_type": "code",
5-
"execution_count": null,
5+
"execution_count": 1,
66
"metadata": {},
77
"outputs": [],
88
"source": [
@@ -35,7 +35,7 @@
3535
},
3636
{
3737
"cell_type": "code",
38-
"execution_count": null,
38+
"execution_count": 2,
3939
"metadata": {},
4040
"outputs": [],
4141
"source": [
@@ -61,7 +61,7 @@
6161
},
6262
{
6363
"cell_type": "code",
64-
"execution_count": null,
64+
"execution_count": 3,
6565
"metadata": {},
6666
"outputs": [],
6767
"source": [
@@ -77,9 +77,17 @@
7777
"Then, for our model, we will need to define a future loading function. More information on what a future loading function is and how to use it can be found here: https://nasa.github.io/progpy/prog_models_guide.html#future-loading"
7878
]
7979
},
80+
{
81+
"attachments": {},
82+
"cell_type": "markdown",
83+
"metadata": {},
84+
"source": [
85+
"Since this is a simple example, we are going to have a constant loading!"
86+
]
87+
},
8088
{
8189
"cell_type": "code",
82-
"execution_count": null,
90+
"execution_count": 4,
8391
"metadata": {},
8492
"outputs": [],
8593
"source": [
@@ -95,6 +103,7 @@
95103
"cell_type": "markdown",
96104
"metadata": {},
97105
"source": [
106+
<<<<<<< Updated upstream
98107
"Since this is a simple example, we are going to have a constant loading!"
99108
]
100109
},
@@ -104,6 +113,9 @@
104113
"metadata": {},
105114
"source": [
106115
"Finally, we are ready to benchmark the simulation.\n",
116+
=======
117+
"Finally, we are going to need to benchmark the simulation!\n",
118+
>>>>>>> Stashed changes
107119
"\n",
108120
"We can do this by using the `timeit()` function and pass in our `simulate_to()` or `simulate_to_threshold()` function for the `stmt` argument. For more information regarding the `timeit()` function, please read its documentation located here: https://docs.python.org/3/library/timeit.html"
109121
]
@@ -151,7 +163,7 @@
151163
"cell_type": "markdown",
152164
"metadata": {},
153165
"source": [
154-
"In this example, we benchmarked the simulation of the BatteryCircuit model up to 600 seconds. By utilizing the `time` package, we are able to benchmark the simulation of the model and print out the results with ease!"
166+
"In this example, we benchmarked the simulation of the BatteryCircuit model up to 600 seconds by utilizing the `time` package!"
155167
]
156168
}
157169
],

0 commit comments

Comments
 (0)