Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cff-version: 1.2.0
message: "If you use this teaching material, or the models in it, please cite it as below."
title: "Teaching notebooks for IE 3315, IE 5301 and REE 4301"
abstract: >-
Nineteen executed teaching notebooks and an accompanying Python package,
Twenty executed teaching notebooks and an accompanying Python package,
organised by subject across three courses in industrial engineering and energy
systems modelling. Each notebook builds its model by hand and then asserts
agreement with the packaged implementation, so the two cannot drift apart
Expand Down
7 changes: 4 additions & 3 deletions CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ They belong with the repository. Moved twice so far: to `C:\dev\` on 2026-09-05,

## Status, measured 2026-09-05

Nineteen notebooks (seventeen as of 2026-09-05) across twelve subjects (`02` empty on purpose), sixteen package modules, thirty-
Twenty notebooks (seventeen as of 2026-09-05) across twelve subjects (`02` empty on purpose), sixteen package modules, thirty-
odd tables in `data/raw/`, 170 tests, and `tools/check_notebooks.py`. README.md has the table.

**What to run before believing anything:** `python -m pytest tests/ -q`,
Expand Down Expand Up @@ -175,5 +175,6 @@ with a status line per finding, and the list of what must change before the firs
**Not done:** the 174 files the migration queue could not classify by name were only partly read;
the ones that were (Pooling, Portfolio Selection, Gandhi Cloth, StochasticLP, the Monte Carlo set,
the REE modules beyond M0) are either migrated or named in a folder README. Fixed-charge / logical
constraints (`Gandhi_Cloth`, `Portfolio Selection`) would be a second `05` notebook; the two-stage
server farm (`StochasticLP`, 14 copies) and the bakery VSS/EVPI example a second `07`.
constraints (`Gandhi_Cloth`, `Portfolio Selection`) would be a second `05` notebook; the bakery
VSS/EVPI example another `07`. The two-stage server farm is `07/server_farm.ipynb` (2026-10-27),
from IE 5301's 2026 code, and `07/risk_measures.ipynb` adds VaR and CVaR.
4 changes: 2 additions & 2 deletions NEXT_SESSION_PROMPT.md
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ caught by a printed number rather than by review or by the suite.

## Still open in this repository, beyond the closed queue

- Second notebooks for `05` (Gandhi cloth fixed charge, Portfolio logic) and `07` (server-farm
two-stage LP, bakery VSS/EVPI).
- Second notebooks for `05` (Gandhi cloth fixed charge, Portfolio logic) and `07` (bakery
VSS/EVPI). The server farm and VaR/CVaR landed in `07` on 2026-10-27.
- Roughly 140 files in the original migration queue were never classified or read.
- ~~`README.md` and `notebooks/12_energy_systems_pypsa/README.md` point at REE 4301 by its
OneDrive path.~~ **Done.** Both carry the GitHub URL, and since 2026-09-13 it resolves for
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ ahead of LP formulation, which is backwards.

## What is here, measured 2026-09-05

Nineteen teaching notebooks in twelve subjects, each with its package module, its tables and its
Twenty teaching notebooks in twelve subjects, each with its package module, its tables and its
tests. `02_simplex_and_bases` is empty on purpose. Every notebook ships executed, ends in the
agreement assertion, and passes `tools/check_notebooks.py`.

Expand All @@ -136,7 +136,7 @@ agreement assertion, and passes `tools/check_notebooks.py`.
| 04 | `transportation`, `assignment` | `transportation`, `assignment` |
| 05 | `facility_location` | `facility_location` |
| 06 | `curve_fit_lifting`, `pooling` | `nonconvex` |
| 07 | `newsvendor`, `risk_measures` | `newsvendor`, `data` |
| 07 | `newsvendor`, `risk_measures`, `server_farm` | `newsvendor`, `data`, `serverfarm` |
| 08 | `monte_carlo` | `montecarlo` |
| 09 | `markov_and_queues` | `markov`, `queueing` |
| 10 | `zero_sum_game`, `saddle_points` | `games` |
Expand Down
51 changes: 51 additions & 0 deletions data/raw/server_farm_demand.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
scenario,cpu,gpu,tpu
1,63.47,7.96,17.05
2,69.1,8.95,17.68
3,78.1,11.05,18.93
4,60.59,8.59,12.18
5,65.48,7.02,17.44
6,73.48,10.5,9.91
7,65.71,10.41,15.16
8,88.42,5.9,19.11
9,75.6,10.69,18.44
10,67.5,5.98,14.88
11,54.51,8.08,12.74
12,70.88,11.13,7.78
13,74.38,9.26,15.09
14,75.75,7.64,18.13
15,65.31,8.16,12.31
16,85.1,7.64,8.19
17,64.73,8.64,17.79
18,79.05,7.94,15.97
19,67.73,10.96,16.62
20,60.64,7.04,15.49
21,44.57,5.41,14.41
22,68.75,8.94,15.51
23,79.78,6.03,11.76
24,74.41,7.33,19.83
25,89.93,8.39,15.8
26,69.22,5.0,14.19
27,62.52,7.85,14.6
28,58.91,5.69,13.82
29,75.01,10.37,17.29
30,69.62,11.55,18.29
31,69.2,8.05,13.5
32,71.51,8.1,10.06
33,65.2,9.1,9.45
34,76.6,8.42,10.87
35,79.14,7.73,14.36
36,65.24,11.47,9.81
37,72.68,10.21,12.03
38,62.42,4.91,8.59
39,82.28,7.69,15.7
40,63.57,5.63,10.85
41,75.95,8.41,20.12
42,67.83,9.06,13.17
43,51.77,10.97,12.42
44,73.74,4.21,10.94
45,57.81,13.44,13.96
46,69.82,7.08,13.68
47,69.82,7.85,11.94
48,76.23,7.02,16.29
49,57.58,4.47,21.9
50,64.53,10.84,15.16
4 changes: 4 additions & 0 deletions data/raw/server_farm_machines.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
machine,purchase_cost,space,cloud_cost
cpu,6,1,7
gpu,14,5,18
tpu,27,3,30
Loading
Loading