Skip to content

Commit 1c26407

Browse files
committed
Merge branch 'QPR-12433-2' into 'master'
Fix notebook example 1 Closes QPR-12433 See merge request qs/oreswig!66
2 parents f860633 + 27e004d commit 1c26407

1 file changed

Lines changed: 18 additions & 90 deletions

File tree

  • OREAnalytics-SWIG/Python/Examples/Notebooks/Example_1

OREAnalytics-SWIG/Python/Examples/Notebooks/Example_1/ore.ipynb

Lines changed: 18 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -139,33 +139,20 @@
139139
"params = Parameters()\n",
140140
"params.fromFile(\"Input/ore.xml\")\n",
141141
"\n",
142-
"ore = OREApp(params)"
142+
"ore = OREApp(params)\n",
143+
"\n",
144+
"ore.run()\n",
145+
"\n",
146+
"utilities.checkErrorsAndRunTime(ore)"
143147
]
144148
},
145149
{
146150
"cell_type": "markdown",
147-
"metadata": {
148-
"extensions": {
149-
"jupyter_dashboards": {
150-
"version": 1,
151-
"views": {
152-
"grid_default": {
153-
"col": 0,
154-
"height": 4,
155-
"hidden": true,
156-
"row": 12,
157-
"width": 12
158-
},
159-
"report_default": {
160-
"hidden": false
161-
}
162-
}
163-
}
164-
},
165-
"tags": []
166-
},
151+
"metadata": {},
167152
"source": [
168-
"**This should have loaded the main inputs**\n",
153+
"## Query Inputs\n",
154+
"\n",
155+
"ore.run() should have loaded and compiled the main inputs\n",
169156
"- portfolio\n",
170157
"- today's market configuration\n",
171158
"- conventions\n",
@@ -178,22 +165,7 @@
178165
{
179166
"cell_type": "code",
180167
"execution_count": null,
181-
"metadata": {
182-
"extensions": {
183-
"jupyter_dashboards": {
184-
"version": 1,
185-
"views": {
186-
"grid_default": {
187-
"hidden": true
188-
},
189-
"report_default": {
190-
"hidden": true
191-
}
192-
}
193-
}
194-
},
195-
"tags": []
196-
},
168+
"metadata": {},
197169
"outputs": [],
198170
"source": [
199171
"portfolio = ore.getInputs().portfolio()\n",
@@ -207,57 +179,6 @@
207179
"print(portfolioXML)"
208180
]
209181
},
210-
{
211-
"cell_type": "markdown",
212-
"metadata": {
213-
"extensions": {
214-
"jupyter_dashboards": {
215-
"version": 1,
216-
"views": {
217-
"grid_default": {
218-
"col": 0,
219-
"height": 4,
220-
"hidden": true,
221-
"row": 12,
222-
"width": 12
223-
},
224-
"report_default": {
225-
"hidden": false
226-
}
227-
}
228-
}
229-
}
230-
},
231-
"source": [
232-
"**Kick off the ORE process**"
233-
]
234-
},
235-
{
236-
"cell_type": "code",
237-
"execution_count": null,
238-
"metadata": {
239-
"extensions": {
240-
"jupyter_dashboards": {
241-
"version": 1,
242-
"views": {
243-
"grid_default": {
244-
"hidden": true
245-
},
246-
"report_default": {
247-
"hidden": true
248-
}
249-
}
250-
}
251-
},
252-
"scrolled": true
253-
},
254-
"outputs": [],
255-
"source": [
256-
"ore.run()\n",
257-
"\n",
258-
"utilities.checkErrorsAndRunTime(ore) "
259-
]
260-
},
261182
{
262183
"cell_type": "markdown",
263184
"metadata": {
@@ -1845,6 +1766,13 @@
18451766
"source": [
18461767
"utilities.writeReport(report, [0, 1, 2])"
18471768
]
1769+
},
1770+
{
1771+
"cell_type": "code",
1772+
"execution_count": null,
1773+
"metadata": {},
1774+
"outputs": [],
1775+
"source": []
18481776
}
18491777
],
18501778
"metadata": {
@@ -1883,7 +1811,7 @@
18831811
"name": "python",
18841812
"nbconvert_exporter": "python",
18851813
"pygments_lexer": "ipython3",
1886-
"version": "3.11.4"
1814+
"version": "3.9.6"
18871815
},
18881816
"widgets": {
18891817
"state": {

0 commit comments

Comments
 (0)