mirror of
https://github.com/ANL-CEEESA/UnitCommitment.jl.git
synced 2025-12-06 08:18:51 -06:00
Validation; reformat source code
This commit is contained in:
11
.gitignore
vendored
11
.gitignore
vendored
@@ -1,3 +1,4 @@
|
||||
*-off.md
|
||||
*.bak
|
||||
*.gz
|
||||
*.ipynb
|
||||
@@ -19,6 +20,7 @@
|
||||
.apdisk
|
||||
.com.apple.timemachine.donotpresent
|
||||
.fseventsd
|
||||
.idea
|
||||
.ipy*
|
||||
.vscode
|
||||
Icon
|
||||
@@ -32,12 +34,11 @@ benchmark/tables
|
||||
benchmark/tmp.json
|
||||
build
|
||||
docs/_build
|
||||
docs/src/tutorials/customizing.md
|
||||
docs/src/tutorials/lmp.md
|
||||
docs/src/tutorials/market.md
|
||||
docs/src/tutorials/usage.md
|
||||
instances/**/*.json
|
||||
instances/_source
|
||||
local
|
||||
notebooks
|
||||
docs/src/tutorials/usage.md
|
||||
docs/src/tutorials/customizing.md
|
||||
docs/src/tutorials/market.md
|
||||
docs/src/tutorials/lmp.md
|
||||
*-off.md
|
||||
1761
web/package-lock.json
generated
1761
web/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -16,8 +16,8 @@
|
||||
"@types/papaparse": "^5.3.16",
|
||||
"@types/react": "^19.1.3",
|
||||
"@types/react-dom": "^19.1.3",
|
||||
"@typescript-eslint/utils": "^8.32.1",
|
||||
"ajv": "^8.17.1",
|
||||
"eslint": "^8.57.1",
|
||||
"papaparse": "^5.5.2",
|
||||
"react": "^19.1.0",
|
||||
"react-dom": "^19.1.0",
|
||||
@@ -58,6 +58,6 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/tabulator-tables": "^6.2.6",
|
||||
"eslint": "^8.57.1"
|
||||
"prettier": "3.5.3"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,14 +1,11 @@
|
||||
<!DOCTYPE html>
|
||||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<meta name="theme-color" content="#000000" />
|
||||
<meta
|
||||
name="description"
|
||||
content="UnitCommitment.jl Case Builder"
|
||||
/>
|
||||
<meta name="description" content="UnitCommitment.jl Case Builder" />
|
||||
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
|
||||
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
|
||||
<title>Case Builder - UnitCommitment.jl</title>
|
||||
|
||||
@@ -4,22 +4,27 @@
|
||||
* Released under the modified BSD license. See COPYING.md for more details.
|
||||
*/
|
||||
|
||||
import {UnitCommitmentScenario} from "../../../core/data";
|
||||
import {changeBusData, createBus, deleteBus, renameBus} from "./BusOperations";
|
||||
import { UnitCommitmentScenario } from "../../../core/data";
|
||||
import {
|
||||
changeBusData,
|
||||
createBus,
|
||||
deleteBus,
|
||||
renameBus,
|
||||
} from "./BusOperations";
|
||||
import assert from "node:assert";
|
||||
|
||||
export const BUS_TEST_DATA_1: UnitCommitmentScenario = {
|
||||
"Parameters": {
|
||||
"Version": "0.4",
|
||||
Parameters: {
|
||||
Version: "0.4",
|
||||
"Power balance penalty ($/MW)": 1000.0,
|
||||
"Time horizon (h)": 5,
|
||||
"Time step (min)": 60,
|
||||
},
|
||||
"Buses": {
|
||||
"b1": {"Load (MW)": [35.79534, 34.38835, 33.45083, 32.89729, 33.25044]},
|
||||
"b2": {"Load (MW)": [14.03739, 13.48563, 13.11797, 12.9009, 13.03939]},
|
||||
"b3": {"Load (MW)": [27.3729, 26.29698, 25.58005, 25.15675, 25.4268]},
|
||||
}
|
||||
Buses: {
|
||||
b1: { "Load (MW)": [35.79534, 34.38835, 33.45083, 32.89729, 33.25044] },
|
||||
b2: { "Load (MW)": [14.03739, 13.48563, 13.11797, 12.9009, 13.03939] },
|
||||
b3: { "Load (MW)": [27.3729, 26.29698, 25.58005, 25.15675, 25.4268] },
|
||||
},
|
||||
};
|
||||
|
||||
test("createBus", () => {
|
||||
@@ -29,56 +34,75 @@ test("createBus", () => {
|
||||
|
||||
test("changeBusData", () => {
|
||||
let scenario = BUS_TEST_DATA_1;
|
||||
scenario = changeBusData("b1", "Load 0", "99", scenario);
|
||||
scenario = changeBusData("b1", "Load 3", "99", scenario);
|
||||
scenario = changeBusData("b3", "Load 4", "99", scenario);
|
||||
let err = null;
|
||||
|
||||
[scenario, err] = changeBusData("b1", "Load 0", "99", scenario);
|
||||
assert.equal(err, null);
|
||||
|
||||
[scenario, err] = changeBusData("b1", "Load 3", "99", scenario);
|
||||
assert.equal(err, null);
|
||||
|
||||
[scenario, err] = changeBusData("b3", "Load 4", "99", scenario);
|
||||
assert.equal(err, null);
|
||||
|
||||
assert.deepEqual(scenario, {
|
||||
"Parameters": {
|
||||
"Version": "0.4",
|
||||
Parameters: {
|
||||
Version: "0.4",
|
||||
"Power balance penalty ($/MW)": 1000.0,
|
||||
"Time horizon (h)": 5,
|
||||
"Time step (min)": 60,
|
||||
},
|
||||
"Buses": {
|
||||
"b1": {"Load (MW)": [99, 34.38835, 33.45083, 99, 33.25044]},
|
||||
"b2": {"Load (MW)": [14.03739, 13.48563, 13.11797, 12.9009, 13.03939]},
|
||||
"b3": {"Load (MW)": [27.3729, 26.29698, 25.58005, 25.15675, 99]},
|
||||
}
|
||||
Buses: {
|
||||
b1: { "Load (MW)": [99, 34.38835, 33.45083, 99, 33.25044] },
|
||||
b2: { "Load (MW)": [14.03739, 13.48563, 13.11797, 12.9009, 13.03939] },
|
||||
b3: { "Load (MW)": [27.3729, 26.29698, 25.58005, 25.15675, 99] },
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
test("changeBusData with invalid numbers", () => {
|
||||
let [, err] = changeBusData("b1", "Load 0", "xx", BUS_TEST_DATA_1);
|
||||
assert(err !== null);
|
||||
assert.equal(err.message, "Invalid value: xx");
|
||||
});
|
||||
|
||||
test("deleteBus", () => {
|
||||
let scenario = BUS_TEST_DATA_1;
|
||||
scenario = deleteBus("b2", scenario);
|
||||
assert.deepEqual(scenario, {
|
||||
"Parameters": {
|
||||
"Version": "0.4",
|
||||
Parameters: {
|
||||
Version: "0.4",
|
||||
"Power balance penalty ($/MW)": 1000.0,
|
||||
"Time horizon (h)": 5,
|
||||
"Time step (min)": 60,
|
||||
},
|
||||
"Buses": {
|
||||
"b1": {"Load (MW)": [35.79534, 34.38835, 33.45083, 32.89729, 33.25044]},
|
||||
"b3": {"Load (MW)": [27.3729, 26.29698, 25.58005, 25.15675, 25.4268]},
|
||||
}
|
||||
Buses: {
|
||||
b1: { "Load (MW)": [35.79534, 34.38835, 33.45083, 32.89729, 33.25044] },
|
||||
b3: { "Load (MW)": [27.3729, 26.29698, 25.58005, 25.15675, 25.4268] },
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
test("renameBus", () => {
|
||||
let scenario = BUS_TEST_DATA_1;
|
||||
scenario = renameBus("b2", "b99", scenario);
|
||||
let [scenario, err] = renameBus("b2", "b99", BUS_TEST_DATA_1);
|
||||
assert(err === null);
|
||||
assert.deepEqual(scenario, {
|
||||
"Parameters": {
|
||||
"Version": "0.4",
|
||||
Parameters: {
|
||||
Version: "0.4",
|
||||
"Power balance penalty ($/MW)": 1000.0,
|
||||
"Time horizon (h)": 5,
|
||||
"Time step (min)": 60,
|
||||
},
|
||||
"Buses": {
|
||||
"b1": {"Load (MW)": [35.79534, 34.38835, 33.45083, 32.89729, 33.25044]},
|
||||
"b99": {"Load (MW)": [14.03739, 13.48563, 13.11797, 12.9009, 13.03939]},
|
||||
"b3": {"Load (MW)": [27.3729, 26.29698, 25.58005, 25.15675, 25.4268]},
|
||||
}
|
||||
Buses: {
|
||||
b1: { "Load (MW)": [35.79534, 34.38835, 33.45083, 32.89729, 33.25044] },
|
||||
b99: { "Load (MW)": [14.03739, 13.48563, 13.11797, 12.9009, 13.03939] },
|
||||
b3: { "Load (MW)": [27.3729, 26.29698, 25.58005, 25.15675, 25.4268] },
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
test("renameBus with duplicated name", () => {
|
||||
let [, err] = renameBus("b3", "b1", BUS_TEST_DATA_1);
|
||||
assert(err != null);
|
||||
assert.equal(err.message, `Bus b1 already exists`);
|
||||
});
|
||||
|
||||
@@ -4,9 +4,10 @@
|
||||
* Released under the modified BSD license. See COPYING.md for more details.
|
||||
*/
|
||||
|
||||
import {Buses, UnitCommitmentScenario} from "../../../core/data";
|
||||
import { Buses, UnitCommitmentScenario } from "../../../core/data";
|
||||
import { ValidationError } from "../../../core/Validation/validate";
|
||||
|
||||
function generateUniqueBusName(scenario: UnitCommitmentScenario) {
|
||||
const generateUniqueBusName = (scenario: UnitCommitmentScenario) => {
|
||||
let newBusName = "b";
|
||||
let counter = 1;
|
||||
let name = `${newBusName}${counter}`;
|
||||
@@ -15,67 +16,91 @@ function generateUniqueBusName(scenario: UnitCommitmentScenario) {
|
||||
name = `${newBusName}${counter}`;
|
||||
}
|
||||
return name;
|
||||
}
|
||||
};
|
||||
|
||||
function generateDefaultBusLoad(scenario: UnitCommitmentScenario) {
|
||||
const T = scenario.Parameters["Time horizon (h)"] * (60 / scenario.Parameters["Time step (min)"]);
|
||||
const generateDefaultBusLoad = (scenario: UnitCommitmentScenario) => {
|
||||
const T =
|
||||
scenario.Parameters["Time horizon (h)"] *
|
||||
(60 / scenario.Parameters["Time step (min)"]);
|
||||
return new Array(T).fill(0);
|
||||
}
|
||||
};
|
||||
|
||||
export function createBus(scenario: UnitCommitmentScenario) {
|
||||
export const createBus = (scenario: UnitCommitmentScenario) => {
|
||||
const load = generateDefaultBusLoad(scenario);
|
||||
let name = generateUniqueBusName(scenario);
|
||||
return {
|
||||
...scenario,
|
||||
"Buses": {
|
||||
Buses: {
|
||||
...scenario.Buses,
|
||||
[name]: {
|
||||
"Load (MW)": load
|
||||
}
|
||||
}
|
||||
"Load (MW)": load,
|
||||
},
|
||||
},
|
||||
};
|
||||
}
|
||||
};
|
||||
|
||||
export function changeBusData(bus: string, field: string, newValue: string, scenario: UnitCommitmentScenario) {
|
||||
export const changeBusData = (
|
||||
bus: string,
|
||||
field: string,
|
||||
newValueStr: string,
|
||||
scenario: UnitCommitmentScenario,
|
||||
): [UnitCommitmentScenario, ValidationError | null] => {
|
||||
// Load (MW)
|
||||
const match = field.match(/Load (\d+)/);
|
||||
if(match) {
|
||||
if (match) {
|
||||
const newValueFloat = parseFloat(newValueStr);
|
||||
if (isNaN(newValueFloat)) {
|
||||
return [scenario, { message: `Invalid value: ${newValueStr}` }];
|
||||
}
|
||||
const idx = parseInt(match[1]!, 10);
|
||||
const newLoad = [...scenario.Buses[bus]!["Load (MW)"]];
|
||||
newLoad[idx] = parseFloat(newValue);
|
||||
return {
|
||||
newLoad[idx] = newValueFloat;
|
||||
return [
|
||||
{
|
||||
...scenario,
|
||||
Buses: {
|
||||
...scenario.Buses,
|
||||
[bus]: {
|
||||
"Load (MW)": newLoad,
|
||||
}
|
||||
}
|
||||
};
|
||||
},
|
||||
},
|
||||
},
|
||||
null,
|
||||
];
|
||||
}
|
||||
|
||||
throw Error(`Unknown field: ${field}`);
|
||||
}
|
||||
};
|
||||
|
||||
export function deleteBus(bus: string, scenario: UnitCommitmentScenario) {
|
||||
const { [bus]: _, ...newBuses} = scenario.Buses;
|
||||
export const deleteBus = (bus: string, scenario: UnitCommitmentScenario) => {
|
||||
const { [bus]: _, ...newBuses } = scenario.Buses;
|
||||
return {
|
||||
...scenario,
|
||||
Buses: newBuses
|
||||
Buses: newBuses,
|
||||
};
|
||||
}
|
||||
};
|
||||
|
||||
export function renameBus(oldName: string, newName: string, scenario: UnitCommitmentScenario) {
|
||||
export const renameBus = (
|
||||
oldName: string,
|
||||
newName: string,
|
||||
scenario: UnitCommitmentScenario,
|
||||
): [UnitCommitmentScenario, ValidationError | null] => {
|
||||
if (newName in scenario.Buses) {
|
||||
return [scenario, { message: `Bus ${newName} already exists` }];
|
||||
}
|
||||
const newBuses: Buses = Object.keys(scenario.Buses).reduce((acc, val) => {
|
||||
if(val === oldName) {
|
||||
if (val === oldName) {
|
||||
acc[newName] = scenario.Buses[val]!;
|
||||
} else {
|
||||
acc[val] = scenario.Buses[val]!;
|
||||
}
|
||||
return acc;
|
||||
}, {} as Buses);
|
||||
return {
|
||||
return [
|
||||
{
|
||||
...scenario,
|
||||
Buses: newBuses
|
||||
};
|
||||
}
|
||||
Buses: newBuses,
|
||||
},
|
||||
null,
|
||||
];
|
||||
};
|
||||
|
||||
@@ -1,58 +0,0 @@
|
||||
/*
|
||||
* UnitCommitment.jl: Optimization Package for Security-Constrained Unit Commitment
|
||||
* Copyright (C) 2020-2025, UChicago Argonne, LLC. All rights reserved.
|
||||
* Released under the modified BSD license. See COPYING.md for more details.
|
||||
*/
|
||||
|
||||
import SectionHeader from "../../Common/SectionHeader/SectionHeader";
|
||||
import {UnitCommitmentScenario} from "../../../core/data";
|
||||
import BusesTable, {generateBusesCsv, parseBusesCsv} from "./BusesTable";
|
||||
import SectionButton from "../../Common/Buttons/SectionButton";
|
||||
import {faDownload, faPlus, faUpload} from "@fortawesome/free-solid-svg-icons";
|
||||
import {offerDownload} from "../../Common/io";
|
||||
import FileUploadElement from "../../Common/Buttons/FileUploadElement";
|
||||
import {useRef} from "react";
|
||||
|
||||
interface BusesProps {
|
||||
scenario: UnitCommitmentScenario,
|
||||
onBusCreated: () => void,
|
||||
onBusDataChanged: (bus: string, field: string, newValue: string) => void,
|
||||
onBusDeleted: (bus: string) => void,
|
||||
onBusRenamed: (oldName: string, newName: string) => void,
|
||||
onDataChanged: (scenario: UnitCommitmentScenario) => void,
|
||||
}
|
||||
|
||||
function BusesComponent(props: BusesProps) {
|
||||
const fileUploadElem = useRef<FileUploadElement>(null);
|
||||
|
||||
const onDownload = () => {
|
||||
const csvContents = generateBusesCsv(props.scenario);
|
||||
offerDownload(csvContents, "text/csv", "buses.csv");
|
||||
};
|
||||
|
||||
const onUpload = () => {
|
||||
fileUploadElem.current!.showFilePicker((csvContents: any) => {
|
||||
const newScenario = parseBusesCsv(props.scenario, csvContents);
|
||||
props.onDataChanged(newScenario);
|
||||
});
|
||||
};
|
||||
|
||||
return (
|
||||
<div>
|
||||
<SectionHeader title="Buses">
|
||||
<SectionButton icon={faPlus} tooltip="Add" onClick={props.onBusCreated}/>
|
||||
<SectionButton icon={faDownload} tooltip="Download" onClick={onDownload}/>
|
||||
<SectionButton icon={faUpload} tooltip="Upload" onClick={onUpload}/>
|
||||
</SectionHeader>
|
||||
<BusesTable
|
||||
scenario={props.scenario}
|
||||
onBusDataChanged={props.onBusDataChanged}
|
||||
onBusDeleted={props.onBusDeleted}
|
||||
onBusRenamed={props.onBusRenamed}
|
||||
/>
|
||||
<FileUploadElement ref={fileUploadElem} accept=".csv"/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default BusesComponent;
|
||||
75
web/src/components/CaseBuilder/Buses/BusesComponent.tsx
Normal file
75
web/src/components/CaseBuilder/Buses/BusesComponent.tsx
Normal file
@@ -0,0 +1,75 @@
|
||||
/*
|
||||
* UnitCommitment.jl: Optimization Package for Security-Constrained Unit Commitment
|
||||
* Copyright (C) 2020-2025, UChicago Argonne, LLC. All rights reserved.
|
||||
* Released under the modified BSD license. See COPYING.md for more details.
|
||||
*/
|
||||
|
||||
import SectionHeader from "../../Common/SectionHeader/SectionHeader";
|
||||
import { UnitCommitmentScenario } from "../../../core/data";
|
||||
import BusesTable, { generateBusesCsv, parseBusesCsv } from "./BusesTable";
|
||||
import SectionButton from "../../Common/Buttons/SectionButton";
|
||||
import {
|
||||
faDownload,
|
||||
faPlus,
|
||||
faUpload,
|
||||
} from "@fortawesome/free-solid-svg-icons";
|
||||
import { offerDownload } from "../../Common/io";
|
||||
import FileUploadElement from "../../Common/Buttons/FileUploadElement";
|
||||
import { useRef } from "react";
|
||||
import { ValidationError } from "../../../core/Validation/validate";
|
||||
|
||||
interface BusesProps {
|
||||
scenario: UnitCommitmentScenario;
|
||||
onBusCreated: () => void;
|
||||
onBusDataChanged: (
|
||||
bus: string,
|
||||
field: string,
|
||||
newValue: string,
|
||||
) => ValidationError | null;
|
||||
onBusDeleted: (bus: string) => void;
|
||||
onBusRenamed: (oldName: string, newName: string) => ValidationError | null;
|
||||
onDataChanged: (scenario: UnitCommitmentScenario) => void;
|
||||
}
|
||||
|
||||
function BusesComponent(props: BusesProps) {
|
||||
const fileUploadElem = useRef<FileUploadElement>(null);
|
||||
|
||||
const onDownload = () => {
|
||||
const csvContents = generateBusesCsv(props.scenario);
|
||||
offerDownload(csvContents, "text/csv", "buses.csv");
|
||||
};
|
||||
|
||||
const onUpload = () => {
|
||||
fileUploadElem.current!.showFilePicker((csvContents: any) => {
|
||||
const newScenario = parseBusesCsv(props.scenario, csvContents);
|
||||
props.onDataChanged(newScenario);
|
||||
});
|
||||
};
|
||||
|
||||
return (
|
||||
<div>
|
||||
<SectionHeader title="Buses">
|
||||
<SectionButton
|
||||
icon={faPlus}
|
||||
tooltip="Add"
|
||||
onClick={props.onBusCreated}
|
||||
/>
|
||||
<SectionButton
|
||||
icon={faDownload}
|
||||
tooltip="Download"
|
||||
onClick={onDownload}
|
||||
/>
|
||||
<SectionButton icon={faUpload} tooltip="Upload" onClick={onUpload} />
|
||||
</SectionHeader>
|
||||
<BusesTable
|
||||
scenario={props.scenario}
|
||||
onBusDataChanged={props.onBusDataChanged}
|
||||
onBusDeleted={props.onBusDeleted}
|
||||
onBusRenamed={props.onBusRenamed}
|
||||
/>
|
||||
<FileUploadElement ref={fileUploadElem} accept=".csv" />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default BusesComponent;
|
||||
@@ -5,8 +5,8 @@
|
||||
*/
|
||||
|
||||
import assert from "node:assert";
|
||||
import {generateBusesCsv, parseBusesCsv} from "./BusesTable";
|
||||
import {BUS_TEST_DATA_1} from "./BusOperations.test";
|
||||
import { generateBusesCsv, parseBusesCsv } from "./BusesTable";
|
||||
import { BUS_TEST_DATA_1 } from "./BusOperations.test";
|
||||
|
||||
test("generate CSV", () => {
|
||||
const actualCsv = generateBusesCsv(BUS_TEST_DATA_1);
|
||||
@@ -25,26 +25,13 @@ test("parse valid CSV", () => {
|
||||
"b3,27.3729,26.29698,25.58005,25.15675,25.4268";
|
||||
const newScenario = parseBusesCsv(BUS_TEST_DATA_1, csvContents);
|
||||
assert.deepEqual(newScenario.Buses, {
|
||||
"b1": {
|
||||
"Load (MW)": [
|
||||
0,
|
||||
1,
|
||||
2,
|
||||
3,
|
||||
4,
|
||||
]
|
||||
b1: {
|
||||
"Load (MW)": [0, 1, 2, 3, 4],
|
||||
},
|
||||
"b3": {
|
||||
"Load (MW)": [
|
||||
27.3729,
|
||||
26.29698,
|
||||
25.58005,
|
||||
25.15675,
|
||||
25.4268,
|
||||
]
|
||||
b3: {
|
||||
"Load (MW)": [27.3729, 26.29698, 25.58005, 25.15675, 25.4268],
|
||||
},
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
test("parse invalid CSV (wrong headers)", () => {
|
||||
|
||||
@@ -4,10 +4,15 @@
|
||||
* Released under the modified BSD license. See COPYING.md for more details.
|
||||
*/
|
||||
|
||||
import Papa from 'papaparse';
|
||||
import {Buses, UnitCommitmentScenario} from "../../../core/data";
|
||||
import {useEffect, useRef} from "react";
|
||||
import {CellComponent, ColumnDefinition, TabulatorFull as Tabulator} from "tabulator-tables";
|
||||
import Papa from "papaparse";
|
||||
import { Buses, UnitCommitmentScenario } from "../../../core/data";
|
||||
import { useEffect, useRef } from "react";
|
||||
import {
|
||||
CellComponent,
|
||||
ColumnDefinition,
|
||||
TabulatorFull as Tabulator,
|
||||
} from "tabulator-tables";
|
||||
import { ValidationError } from "../../../core/Validation/validate";
|
||||
|
||||
const generateBusesTableData = (scenario: UnitCommitmentScenario) => {
|
||||
const tableData: { [name: string]: any }[] = [];
|
||||
@@ -22,7 +27,9 @@ const generateBusesTableData = (scenario: UnitCommitmentScenario) => {
|
||||
return tableData;
|
||||
};
|
||||
|
||||
const generateBusesTableColumns = (scenario: UnitCommitmentScenario): [ColumnDefinition] => {
|
||||
const generateBusesTableColumns = (
|
||||
scenario: UnitCommitmentScenario,
|
||||
): [ColumnDefinition] => {
|
||||
const timeHorizonHours = scenario["Parameters"]["Time horizon (h)"];
|
||||
const timeStepMin = scenario["Parameters"]["Time step (min)"];
|
||||
const columnsCommonAttrs: ColumnDefinition = {
|
||||
@@ -46,10 +53,14 @@ const generateBusesTableColumns = (scenario: UnitCommitmentScenario): [ColumnDef
|
||||
width: 150,
|
||||
},
|
||||
];
|
||||
for (let m = 0, offset = 0; m < timeHorizonHours * 60; m += timeStepMin, offset += 1) {
|
||||
for (
|
||||
let m = 0, offset = 0;
|
||||
m < timeHorizonHours * 60;
|
||||
m += timeStepMin, offset += 1
|
||||
) {
|
||||
const hours = Math.floor(m / 60);
|
||||
const mins = m % 60;
|
||||
const formattedTime = `${String(hours).padStart(2, '0')}:${String(mins).padStart(2, '0')}`;
|
||||
const formattedTime = `${String(hours).padStart(2, "0")}:${String(mins).padStart(2, "0")}`;
|
||||
columns.push({
|
||||
...columnsCommonAttrs,
|
||||
title: `Load (MW)<div class="subtitle">${formattedTime}</div>`,
|
||||
@@ -62,24 +73,33 @@ const generateBusesTableColumns = (scenario: UnitCommitmentScenario): [ColumnDef
|
||||
|
||||
export const generateBusesCsv = (scenario: UnitCommitmentScenario) => {
|
||||
const columns = generateBusesTableColumns(scenario);
|
||||
const csvHeader = columns.map(row => row.field).join(",");
|
||||
const csvBody = Object.entries(scenario.Buses).map(([busName, busData]) => {
|
||||
const csvHeader = columns.map((row) => row.field).join(",");
|
||||
const csvBody = Object.entries(scenario.Buses)
|
||||
.map(([busName, busData]) => {
|
||||
const csvLoad = busData["Load (MW)"].join(",");
|
||||
return `${busName},${csvLoad}`;
|
||||
}).join("\n");
|
||||
})
|
||||
.join("\n");
|
||||
return `${csvHeader}\n${csvBody}`;
|
||||
};
|
||||
|
||||
function getNumTimesteps(scenario: UnitCommitmentScenario) {
|
||||
return scenario.Parameters["Time horizon (h)"] * scenario.Parameters["Time step (min)"] / 60;
|
||||
return (
|
||||
(scenario.Parameters["Time horizon (h)"] *
|
||||
scenario.Parameters["Time step (min)"]) /
|
||||
60
|
||||
);
|
||||
}
|
||||
|
||||
export const parseBusesCsv = (scenario: UnitCommitmentScenario, csvData: string): UnitCommitmentScenario => {
|
||||
export const parseBusesCsv = (
|
||||
scenario: UnitCommitmentScenario,
|
||||
csvData: string,
|
||||
): UnitCommitmentScenario => {
|
||||
const results = Papa.parse(csvData, {
|
||||
header: true,
|
||||
skipEmptyLines: true,
|
||||
transformHeader: (header) => header.trim(),
|
||||
transform: (value) => value.trim()
|
||||
transform: (value) => value.trim(),
|
||||
});
|
||||
|
||||
// Check for parsing errors
|
||||
@@ -88,7 +108,9 @@ export const parseBusesCsv = (scenario: UnitCommitmentScenario, csvData: string)
|
||||
}
|
||||
|
||||
// Check CSV headers
|
||||
const expectedFields = generateBusesTableColumns(scenario).map(col => col.field)!;
|
||||
const expectedFields = generateBusesTableColumns(scenario).map(
|
||||
(col) => col.field,
|
||||
)!;
|
||||
const actualFields = results.meta.fields!;
|
||||
for (let i = 0; i < expectedFields.length; i++) {
|
||||
if (expectedFields[i] !== actualFields[i]) {
|
||||
@@ -107,7 +129,7 @@ export const parseBusesCsv = (scenario: UnitCommitmentScenario, csvData: string)
|
||||
busLoad[j] = parseFloat(row[`Load ${j}`]);
|
||||
}
|
||||
buses[busName] = {
|
||||
"Load (MW)": busLoad
|
||||
"Load (MW)": busLoad,
|
||||
};
|
||||
}
|
||||
return {
|
||||
@@ -117,61 +139,60 @@ export const parseBusesCsv = (scenario: UnitCommitmentScenario, csvData: string)
|
||||
};
|
||||
|
||||
interface BusesTableProps {
|
||||
scenario: UnitCommitmentScenario
|
||||
onBusDataChanged: (bus: string, field: string, newValue: string) => void,
|
||||
onBusDeleted: (bus: string) => void,
|
||||
onBusRenamed: (oldName: string, newName: string) => void,
|
||||
scenario: UnitCommitmentScenario;
|
||||
onBusDataChanged: (
|
||||
bus: string,
|
||||
field: string,
|
||||
newValue: string,
|
||||
) => ValidationError | null;
|
||||
onBusDeleted: (bus: string) => void;
|
||||
onBusRenamed: (oldName: string, newName: string) => ValidationError | null;
|
||||
}
|
||||
|
||||
function BusesTable(props: BusesTableProps) {
|
||||
const tableContainerRef = useRef<HTMLDivElement | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
const scenario = props.scenario;
|
||||
const onCellEdited = (cell: CellComponent) => {
|
||||
let newValue = cell.getValue();
|
||||
let oldValue = cell.getOldValue();
|
||||
if (newValue === oldValue) return;
|
||||
// eslint-disable-next-line eqeqeq
|
||||
if (newValue == oldValue) return;
|
||||
|
||||
if (cell.getField() === "Name") {
|
||||
if (newValue === "") {
|
||||
props.onBusDeleted(oldValue);
|
||||
cell.getRow().delete();
|
||||
} else {
|
||||
props.onBusRenamed(
|
||||
oldValue,
|
||||
newValue,
|
||||
);
|
||||
const err = props.onBusRenamed(oldValue, newValue);
|
||||
if (err) {
|
||||
cell.restoreOldValue();
|
||||
}
|
||||
}
|
||||
} else {
|
||||
const row = cell.getRow().getData();
|
||||
const bus = row["Name"];
|
||||
props.onBusDataChanged(
|
||||
bus, cell.getField(), newValue
|
||||
);
|
||||
const err = props.onBusDataChanged(bus, cell.getField(), newValue);
|
||||
if (err) {
|
||||
cell.restoreOldValue();
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
if (tableContainerRef.current === null) return;
|
||||
const table = new Tabulator(tableContainerRef.current, {
|
||||
layout: "fitColumns",
|
||||
data: generateBusesTableData(props.scenario),
|
||||
columns: generateBusesTableColumns(props.scenario),
|
||||
data: generateBusesTableData(scenario),
|
||||
columns: generateBusesTableColumns(scenario),
|
||||
maxHeight: "500px",
|
||||
});
|
||||
table.on("cellEdited", (cell) => {
|
||||
onCellEdited(cell);
|
||||
});
|
||||
table.on("cellEditing", (cell) => {
|
||||
});
|
||||
// table.on("scrollHorizontal", (left, leftDir) => {
|
||||
// console.log(left, leftDir);
|
||||
// });
|
||||
table.rowManager.scrollHorizontal(100, false);
|
||||
// table.columnManager.scrollHorizontal(100, false);
|
||||
}, [props, props.scenario]);
|
||||
}, [props]);
|
||||
|
||||
return <div className="tableContainer" ref={tableContainerRef}/>;
|
||||
return <div className="tableContainer" ref={tableContainerRef} />;
|
||||
}
|
||||
|
||||
export default BusesTable;
|
||||
|
||||
|
||||
@@ -6,16 +6,25 @@
|
||||
|
||||
import Header from "./Header/Header";
|
||||
import Parameters from "./Parameters/Parameters";
|
||||
import BusesComponent from "./Buses/Buses";
|
||||
import {BLANK_SCENARIO, TEST_SCENARIO, UnitCommitmentScenario} from "../../core/data";
|
||||
import BusesComponent from "./Buses/BusesComponent";
|
||||
import {
|
||||
BLANK_SCENARIO,
|
||||
TEST_SCENARIO,
|
||||
UnitCommitmentScenario,
|
||||
} from "../../core/data";
|
||||
|
||||
import "tabulator-tables/dist/css/tabulator.min.css";
|
||||
import "../Common/Forms/Tables.css";
|
||||
import {useState} from "react";
|
||||
import { useState } from "react";
|
||||
import Footer from "./Footer/Footer";
|
||||
import {validate} from "../../core/Validation/validate";
|
||||
import {offerDownload} from "../Common/io";
|
||||
import {changeBusData, createBus, deleteBus, renameBus} from "./Buses/BusOperations";
|
||||
import { validate, ValidationError } from "../../core/Validation/validate";
|
||||
import { offerDownload } from "../Common/io";
|
||||
import {
|
||||
changeBusData,
|
||||
createBus,
|
||||
deleteBus,
|
||||
renameBus,
|
||||
} from "./Buses/BusOperations";
|
||||
|
||||
const CaseBuilder = () => {
|
||||
const [scenario, setScenario] = useState(TEST_SCENARIO);
|
||||
@@ -27,8 +36,8 @@ const CaseBuilder = () => {
|
||||
const onSave = () => {
|
||||
offerDownload(
|
||||
JSON.stringify(scenario, null, 2),
|
||||
'application/json',
|
||||
'case.json',
|
||||
"application/json",
|
||||
"case.json",
|
||||
);
|
||||
};
|
||||
|
||||
@@ -37,9 +46,18 @@ const CaseBuilder = () => {
|
||||
setScenario(newScenario);
|
||||
};
|
||||
|
||||
const onBusDataChanged = (bus: string, field: string, newValue: string) => {
|
||||
const newScenario = changeBusData(bus, field, newValue, scenario);
|
||||
const onBusDataChanged = (
|
||||
bus: string,
|
||||
field: string,
|
||||
newValue: string,
|
||||
): ValidationError | null => {
|
||||
const [newScenario, err] = changeBusData(bus, field, newValue, scenario);
|
||||
if (err) {
|
||||
console.log(err);
|
||||
return err;
|
||||
}
|
||||
setScenario(newScenario);
|
||||
return null;
|
||||
};
|
||||
|
||||
const onBusDeleted = (bus: string) => {
|
||||
@@ -47,9 +65,17 @@ const CaseBuilder = () => {
|
||||
setScenario(newScenario);
|
||||
};
|
||||
|
||||
const onBusRenamed = (oldName: string, newName: string) => {
|
||||
const newScenario = renameBus(oldName, newName, scenario);
|
||||
const onBusRenamed = (
|
||||
oldName: string,
|
||||
newName: string,
|
||||
): ValidationError | null => {
|
||||
const [newScenario, err] = renameBus(oldName, newName, scenario);
|
||||
if (err) {
|
||||
console.log(err);
|
||||
return err;
|
||||
}
|
||||
setScenario(newScenario);
|
||||
return null;
|
||||
};
|
||||
|
||||
const onDataChanged = (newScenario: UnitCommitmentScenario) => {
|
||||
@@ -64,14 +90,11 @@ const CaseBuilder = () => {
|
||||
setScenario(scenario);
|
||||
};
|
||||
|
||||
return <div>
|
||||
<Header
|
||||
onClear={onClear}
|
||||
onSave={onSave}
|
||||
onLoad={onLoad}
|
||||
/>
|
||||
return (
|
||||
<div>
|
||||
<Header onClear={onClear} onSave={onSave} onLoad={onLoad} />
|
||||
<div className="content">
|
||||
<Parameters scenario={scenario}/>
|
||||
<Parameters scenario={scenario} />
|
||||
<BusesComponent
|
||||
scenario={scenario}
|
||||
onBusCreated={onBusCreated}
|
||||
@@ -81,8 +104,9 @@ const CaseBuilder = () => {
|
||||
onDataChanged={onDataChanged}
|
||||
/>
|
||||
</div>
|
||||
<Footer/>
|
||||
</div>;
|
||||
<Footer />
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default CaseBuilder;
|
||||
@@ -9,7 +9,8 @@ import styles from "./Footer.module.css";
|
||||
function Footer() {
|
||||
return (
|
||||
<div className={styles.Footer}>
|
||||
UnitCommitment.jl: Optimization Package for Security-Constrained Unit Commitment <br/>
|
||||
UnitCommitment.jl: Optimization Package for Security-Constrained Unit
|
||||
Commitment <br />
|
||||
Copyright (C) 2020-2025, UChicago Argonne, LLC. All rights reserved.
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -18,7 +18,8 @@
|
||||
min-width: var(--site-min-width);
|
||||
}
|
||||
|
||||
.HeaderContent h1, h2 {
|
||||
.HeaderContent h1,
|
||||
h2 {
|
||||
color: var(--contrast-100);
|
||||
display: inline-block;
|
||||
line-height: 48px;
|
||||
@@ -38,5 +39,3 @@
|
||||
float: right;
|
||||
padding: 16px 12px;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
import styles from "./Header.module.css";
|
||||
import SiteHeaderButton from "../../Common/Buttons/SiteHeaderButton";
|
||||
import {UnitCommitmentScenario} from "../../../core/data";
|
||||
import {useRef} from "react";
|
||||
import { UnitCommitmentScenario } from "../../../core/data";
|
||||
import { useRef } from "react";
|
||||
import FileUploadElement from "../../Common/Buttons/FileUploadElement";
|
||||
|
||||
interface HeaderProps {
|
||||
onClear: () => void
|
||||
onSave: () => void
|
||||
onLoad: (data: UnitCommitmentScenario) => void
|
||||
onClear: () => void;
|
||||
onSave: () => void;
|
||||
onLoad: (data: UnitCommitmentScenario) => void;
|
||||
}
|
||||
|
||||
function Header(props: HeaderProps) {
|
||||
@@ -32,11 +32,11 @@ function Header(props: HeaderProps) {
|
||||
<h1>UnitCommitment.jl</h1>
|
||||
<h2>Case Builder</h2>
|
||||
<div className={styles.buttonContainer}>
|
||||
<SiteHeaderButton title="Clear" onClick={props.onClear}/>
|
||||
<SiteHeaderButton title="Load" onClick={onLoad}/>
|
||||
<SiteHeaderButton title="Save" onClick={props.onSave}/>
|
||||
<SiteHeaderButton title="Clear" onClick={props.onClear} />
|
||||
<SiteHeaderButton title="Load" onClick={onLoad} />
|
||||
<SiteHeaderButton title="Save" onClick={props.onSave} />
|
||||
</div>
|
||||
<FileUploadElement ref={fileElem} accept=".json"/>
|
||||
<FileUploadElement ref={fileElem} accept=".json" />
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -7,17 +7,16 @@
|
||||
import SectionHeader from "../../Common/SectionHeader/SectionHeader";
|
||||
import Form from "../../Common/Forms/Form";
|
||||
import TextInputRow from "../../Common/Forms/TextInputRow";
|
||||
import {UnitCommitmentScenario} from "../../../core/data";
|
||||
import { UnitCommitmentScenario } from "../../../core/data";
|
||||
|
||||
interface ParametersProps {
|
||||
scenario: UnitCommitmentScenario
|
||||
scenario: UnitCommitmentScenario;
|
||||
}
|
||||
|
||||
function Parameters({scenario}: ParametersProps) {
|
||||
function Parameters({ scenario }: ParametersProps) {
|
||||
return (
|
||||
<div>
|
||||
<SectionHeader title="Parameters">
|
||||
</SectionHeader>
|
||||
<SectionHeader title="Parameters"></SectionHeader>
|
||||
<Form>
|
||||
<TextInputRow
|
||||
label="Time horizon"
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* Released under the modified BSD license. See COPYING.md for more details.
|
||||
*/
|
||||
|
||||
import React, {Component} from "react";
|
||||
import React, { Component } from "react";
|
||||
|
||||
class FileUploadElement extends Component<any> {
|
||||
private inputRef = React.createRef<HTMLInputElement>();
|
||||
@@ -25,17 +25,19 @@ class FileUploadElement extends Component<any> {
|
||||
};
|
||||
reader.readAsText(file);
|
||||
}
|
||||
event.target.value = '';
|
||||
event.target.value = "";
|
||||
};
|
||||
|
||||
override render() {
|
||||
return <input
|
||||
return (
|
||||
<input
|
||||
ref={this.inputRef}
|
||||
type="file"
|
||||
accept={this.props.accept}
|
||||
style={{ display: "none" }}
|
||||
onChange={this.onFileSelected}
|
||||
/>;
|
||||
/>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -5,16 +5,15 @@
|
||||
*/
|
||||
|
||||
import styles from "./HelpButton.module.css";
|
||||
import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
|
||||
import {faCircleQuestion} from '@fortawesome/free-regular-svg-icons';
|
||||
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
|
||||
import { faCircleQuestion } from "@fortawesome/free-regular-svg-icons";
|
||||
|
||||
|
||||
function HelpButton({text}: { text: String }) {
|
||||
function HelpButton({ text }: { text: String }) {
|
||||
return (
|
||||
<button className={styles.HelpButton}>
|
||||
<span className={styles.tooltip}>{text}</span>
|
||||
<span className={styles.icon}>
|
||||
<FontAwesomeIcon icon={faCircleQuestion}/>
|
||||
<FontAwesomeIcon icon={faCircleQuestion} />
|
||||
</span>
|
||||
</button>
|
||||
);
|
||||
|
||||
@@ -4,14 +4,14 @@
|
||||
* Released under the modified BSD license. See COPYING.md for more details.
|
||||
*/
|
||||
|
||||
import {IconDefinition} from "@fortawesome/fontawesome-svg-core";
|
||||
import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
|
||||
import { IconDefinition } from "@fortawesome/fontawesome-svg-core";
|
||||
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
|
||||
import styles from "./SectionButton.module.css";
|
||||
|
||||
interface SectionButtonProps {
|
||||
icon: IconDefinition,
|
||||
tooltip: string,
|
||||
onClick?: () => void,
|
||||
icon: IconDefinition;
|
||||
tooltip: string;
|
||||
onClick?: () => void;
|
||||
}
|
||||
|
||||
function SectionButton(props: SectionButtonProps) {
|
||||
@@ -21,7 +21,7 @@ function SectionButton(props: SectionButtonProps) {
|
||||
title={props.tooltip}
|
||||
onClick={props.onClick}
|
||||
>
|
||||
<FontAwesomeIcon icon={props.icon}/>
|
||||
<FontAwesomeIcon icon={props.icon} />
|
||||
</button>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -6,11 +6,15 @@
|
||||
|
||||
import styles from "./SiteHeaderButton.module.css";
|
||||
|
||||
function SiteHeaderButton({title, onClick}: { title: string, onClick?: () => void }) {
|
||||
function SiteHeaderButton({
|
||||
title,
|
||||
onClick,
|
||||
}: {
|
||||
title: string;
|
||||
onClick?: () => void;
|
||||
}) {
|
||||
return (
|
||||
<button
|
||||
className={styles.SiteHeaderButton}
|
||||
onClick={onClick}>
|
||||
<button className={styles.SiteHeaderButton} onClick={onClick}>
|
||||
{title}
|
||||
</button>
|
||||
);
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
* Released under the modified BSD license. See COPYING.md for more details.
|
||||
*/
|
||||
|
||||
import {ReactNode} from 'react';
|
||||
import { ReactNode } from "react";
|
||||
import styles from "./Form.module.css";
|
||||
|
||||
function Form({children}: { children: ReactNode }) {
|
||||
function Form({ children }: { children: ReactNode }) {
|
||||
return <div className={styles.Form}>{children}</div>;
|
||||
}
|
||||
|
||||
|
||||
@@ -7,12 +7,18 @@
|
||||
import formStyles from "./Form.module.css";
|
||||
import HelpButton from "../Buttons/HelpButton";
|
||||
|
||||
function TextInputRow({label, unit, tooltip, currentValue, defaultValue}: {
|
||||
label: string,
|
||||
unit: string,
|
||||
tooltip: string,
|
||||
currentValue: string,
|
||||
defaultValue: string,
|
||||
function TextInputRow({
|
||||
label,
|
||||
unit,
|
||||
tooltip,
|
||||
currentValue,
|
||||
defaultValue,
|
||||
}: {
|
||||
label: string;
|
||||
unit: string;
|
||||
tooltip: string;
|
||||
currentValue: string;
|
||||
defaultValue: string;
|
||||
}) {
|
||||
return (
|
||||
<div className={formStyles.FormRow}>
|
||||
@@ -20,12 +26,8 @@ function TextInputRow({label, unit, tooltip, currentValue, defaultValue}: {
|
||||
{label}
|
||||
<span className={formStyles.FormRow_unit}> ({unit})</span>
|
||||
</label>
|
||||
<input
|
||||
type="text"
|
||||
placeholder={defaultValue}
|
||||
value={currentValue}
|
||||
/>
|
||||
<HelpButton text={tooltip}/>
|
||||
<input type="text" placeholder={defaultValue} value={currentValue} />
|
||||
<HelpButton text={tooltip} />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -5,20 +5,17 @@
|
||||
*/
|
||||
|
||||
import styles from "./SectionHeader.module.css";
|
||||
import {ReactNode} from "react";
|
||||
import { ReactNode } from "react";
|
||||
|
||||
interface SectionHeaderProps {
|
||||
title: string,
|
||||
children: ReactNode
|
||||
title: string;
|
||||
children?: ReactNode;
|
||||
}
|
||||
|
||||
|
||||
function SectionHeader({title, children}: SectionHeaderProps) {
|
||||
function SectionHeader({ title, children }: SectionHeaderProps) {
|
||||
return (
|
||||
<div className={styles.SectionHeader}>
|
||||
<div className={styles.SectionButtonsContainer}>
|
||||
{children}
|
||||
</div>
|
||||
<div className={styles.SectionButtonsContainer}>{children}</div>
|
||||
<h1>{title}</h1>
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -5,9 +5,9 @@
|
||||
*/
|
||||
|
||||
export function offerDownload(data: string, type: string, filename: string) {
|
||||
const dataBlob = new Blob([data], {type: type});
|
||||
const dataBlob = new Blob([data], { type: type });
|
||||
const url = URL.createObjectURL(dataBlob);
|
||||
const link = document.createElement('a');
|
||||
const link = document.createElement("a");
|
||||
link.href = url;
|
||||
link.download = filename;
|
||||
document.body.appendChild(link);
|
||||
|
||||
@@ -11,53 +11,53 @@ export const schema = {
|
||||
Parameters: {
|
||||
type: "object",
|
||||
properties: {
|
||||
"Version": {
|
||||
Version: {
|
||||
type: "string",
|
||||
const: "0.4",
|
||||
description: "Version of UnitCommitment.jl"
|
||||
description: "Version of UnitCommitment.jl",
|
||||
},
|
||||
"Time horizon (min)": {
|
||||
type: "number",
|
||||
exclusiveMinimum: 0,
|
||||
description: "Length of the planning horizon in minutes"
|
||||
description: "Length of the planning horizon in minutes",
|
||||
},
|
||||
"Time horizon (h)": {
|
||||
type: "number",
|
||||
exclusiveMinimum: 0,
|
||||
description: "Length of the planning horizon in hours"
|
||||
description: "Length of the planning horizon in hours",
|
||||
},
|
||||
"Time step (min)": {
|
||||
type: "number",
|
||||
default: 60,
|
||||
enum: [60, 30, 20, 15, 12, 10, 6, 5, 4, 3, 2, 1],
|
||||
description: "Must be a divisor of 60"
|
||||
description: "Must be a divisor of 60",
|
||||
},
|
||||
"Power balance penalty ($/MW)": {
|
||||
type: "number",
|
||||
default: 1000.0,
|
||||
minimum: 0,
|
||||
description: "Penalty for system-wide shortage or surplus"
|
||||
description: "Penalty for system-wide shortage or surplus",
|
||||
},
|
||||
"Scenario name": {
|
||||
type: "string",
|
||||
default: "s1",
|
||||
description: "Name of the scenario"
|
||||
description: "Name of the scenario",
|
||||
},
|
||||
"Scenario weight": {
|
||||
type: "number",
|
||||
default: 1.0,
|
||||
exclusiveMinimum: 0,
|
||||
description: "Weight of the scenario"
|
||||
}
|
||||
description: "Weight of the scenario",
|
||||
},
|
||||
},
|
||||
required: ["Time step (min)", "Power balance penalty ($/MW)"],
|
||||
oneOf: [
|
||||
{ required: ["Time horizon (min)"] },
|
||||
{ required: ["Time horizon (h)"] }
|
||||
{ required: ["Time horizon (h)"] },
|
||||
],
|
||||
not: {
|
||||
required: ["Time horizon (min)", "Time horizon (h)"]
|
||||
}
|
||||
required: ["Time horizon (min)", "Time horizon (h)"],
|
||||
},
|
||||
},
|
||||
Bus: {
|
||||
type: "object",
|
||||
@@ -71,15 +71,12 @@ export const schema = {
|
||||
{
|
||||
type: "array",
|
||||
items: {
|
||||
oneOf: [
|
||||
{ type: "number" },
|
||||
{ type: "null" }
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
oneOf: [{ type: "number" }, { type: "null" }],
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
TransmissionLines: {
|
||||
@@ -95,36 +92,36 @@ export const schema = {
|
||||
type: "string",
|
||||
minLength: 1,
|
||||
not: {
|
||||
const: { $data: "1/Source bus" }
|
||||
}
|
||||
const: { $data: "1/Source bus" },
|
||||
},
|
||||
},
|
||||
"Susceptance (S)": {
|
||||
type: "number",
|
||||
minimum: 0
|
||||
minimum: 0,
|
||||
},
|
||||
"Normal flow limit (MW)": {
|
||||
type: "number",
|
||||
minimum: 0
|
||||
minimum: 0,
|
||||
},
|
||||
"Emergency flow limit (MW)": {
|
||||
type: "number",
|
||||
minimum: 0
|
||||
minimum: 0,
|
||||
},
|
||||
"Flow limit penalty ($/MW)": {
|
||||
type: "number",
|
||||
minimum: 0,
|
||||
default: 5000.0
|
||||
}
|
||||
default: 5000.0,
|
||||
},
|
||||
},
|
||||
required: ["Source bus", "Target bus", "Susceptance (S)"],
|
||||
},
|
||||
required: ["Source bus", "Target bus", "Susceptance (S)"]
|
||||
}
|
||||
},
|
||||
StorageUnits: {
|
||||
type: "object",
|
||||
additionalProperties: {
|
||||
type: "object",
|
||||
properties: {
|
||||
"Bus": {
|
||||
Bus: {
|
||||
type: "string",
|
||||
minLength: 1,
|
||||
},
|
||||
@@ -133,65 +130,65 @@ export const schema = {
|
||||
},
|
||||
"Maximum level (MWh)": {
|
||||
type: "number",
|
||||
minimum: 0
|
||||
minimum: 0,
|
||||
},
|
||||
"Allow simultaneous charging and discharging": {
|
||||
type: "boolean",
|
||||
default: true
|
||||
default: true,
|
||||
},
|
||||
"Charge cost ($/MW)": {
|
||||
type: "number",
|
||||
minimum: 0
|
||||
minimum: 0,
|
||||
},
|
||||
"Discharge cost ($/MW)": {
|
||||
type: "number",
|
||||
minimum: 0
|
||||
minimum: 0,
|
||||
},
|
||||
"Charge efficiency": {
|
||||
type: "number",
|
||||
minimum: 0,
|
||||
maximum: 1
|
||||
maximum: 1,
|
||||
},
|
||||
"Discharge efficiency": {
|
||||
type: "number",
|
||||
minimum: 0,
|
||||
maximum: 1
|
||||
maximum: 1,
|
||||
},
|
||||
"Loss factor": {
|
||||
type: "number",
|
||||
minimum: 0
|
||||
minimum: 0,
|
||||
},
|
||||
"Minimum charge rate (MW)": {
|
||||
type: "number",
|
||||
minimum: 0
|
||||
minimum: 0,
|
||||
},
|
||||
"Maximum charge rate (MW)": {
|
||||
type: "number",
|
||||
minimum: 0
|
||||
minimum: 0,
|
||||
},
|
||||
"Minimum discharge rate (MW)": {
|
||||
type: "number",
|
||||
minimum: 0
|
||||
minimum: 0,
|
||||
},
|
||||
"Maximum discharge rate (MW)": {
|
||||
type: "number",
|
||||
minimum: 0
|
||||
minimum: 0,
|
||||
},
|
||||
"Initial level (MWh)": {
|
||||
type: "number",
|
||||
minimum: 0
|
||||
minimum: 0,
|
||||
},
|
||||
"Last period minimum level (MWh)": {
|
||||
type: "number",
|
||||
minimum: 0
|
||||
minimum: 0,
|
||||
},
|
||||
"Last period maximum level (MWh)": {
|
||||
type: "number",
|
||||
minimum: 0
|
||||
}
|
||||
minimum: 0,
|
||||
},
|
||||
},
|
||||
required: ["Bus"],
|
||||
},
|
||||
required: ["Bus"]
|
||||
}
|
||||
},
|
||||
Generators: {
|
||||
type: "object",
|
||||
@@ -199,90 +196,90 @@ export const schema = {
|
||||
type: "object",
|
||||
if: {
|
||||
properties: {
|
||||
"Type": { const: "Thermal" }
|
||||
}
|
||||
Type: { const: "Thermal" },
|
||||
},
|
||||
},
|
||||
then: {
|
||||
properties: {
|
||||
"Bus": {
|
||||
Bus: {
|
||||
type: "string",
|
||||
minLength: 1,
|
||||
},
|
||||
"Type": {
|
||||
Type: {
|
||||
type: "string",
|
||||
const: "Thermal"
|
||||
const: "Thermal",
|
||||
},
|
||||
"Production cost curve (MW)": {
|
||||
type: "array",
|
||||
items: {
|
||||
type: "number",
|
||||
minimum: 0
|
||||
minimum: 0,
|
||||
},
|
||||
minItems: 1
|
||||
minItems: 1,
|
||||
},
|
||||
"Production cost curve ($)": {
|
||||
type: "array",
|
||||
items: {
|
||||
type: "number",
|
||||
minimum: 0
|
||||
minimum: 0,
|
||||
},
|
||||
minItems: 1
|
||||
minItems: 1,
|
||||
},
|
||||
"Startup costs ($)": {
|
||||
type: "array",
|
||||
items: {
|
||||
type: "number",
|
||||
minimum: 0
|
||||
minimum: 0,
|
||||
},
|
||||
default: [0.0]
|
||||
default: [0.0],
|
||||
},
|
||||
"Startup delays (h)": {
|
||||
type: "array",
|
||||
items: {
|
||||
type: "integer",
|
||||
minimum: 1
|
||||
minimum: 1,
|
||||
},
|
||||
default: [1]
|
||||
default: [1],
|
||||
},
|
||||
"Minimum uptime (h)": {
|
||||
type: "integer",
|
||||
default: 1,
|
||||
minimum: 0
|
||||
minimum: 0,
|
||||
},
|
||||
"Minimum downtime (h)": {
|
||||
type: "integer",
|
||||
default: 1,
|
||||
minimum: 0
|
||||
minimum: 0,
|
||||
},
|
||||
"Ramp up limit (MW)": {
|
||||
type: "number",
|
||||
minimum: 0
|
||||
minimum: 0,
|
||||
},
|
||||
"Ramp down limit (MW)": {
|
||||
type: "number",
|
||||
minimum: 0
|
||||
minimum: 0,
|
||||
},
|
||||
"Startup limit (MW)": {
|
||||
type: "number",
|
||||
minimum: 0
|
||||
minimum: 0,
|
||||
},
|
||||
"Shutdown limit (MW)": {
|
||||
type: "number",
|
||||
minimum: 0
|
||||
minimum: 0,
|
||||
},
|
||||
"Initial status (h)": {
|
||||
type: "integer",
|
||||
default: 1,
|
||||
not: { const: 0 }
|
||||
not: { const: 0 },
|
||||
},
|
||||
"Initial power (MW)": {
|
||||
type: "number",
|
||||
minimum: 0
|
||||
minimum: 0,
|
||||
},
|
||||
"Must run?": {
|
||||
type: "boolean",
|
||||
default: false
|
||||
}
|
||||
default: false,
|
||||
},
|
||||
},
|
||||
required: [
|
||||
"Bus",
|
||||
@@ -290,13 +287,13 @@ export const schema = {
|
||||
"Production cost curve (MW)",
|
||||
"Production cost curve ($)",
|
||||
"Initial status (h)",
|
||||
"Initial power (MW)"
|
||||
]
|
||||
"Initial power (MW)",
|
||||
],
|
||||
},
|
||||
else: {
|
||||
properties: {
|
||||
"Type": { const: "Profiled" },
|
||||
"Bus": {
|
||||
Type: { const: "Profiled" },
|
||||
Bus: {
|
||||
type: "string",
|
||||
minLength: 1,
|
||||
},
|
||||
@@ -309,19 +306,18 @@ export const schema = {
|
||||
type: "array",
|
||||
items: {
|
||||
type: "number",
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
"Cost ($/MW)": {
|
||||
type: "number",
|
||||
minimum: 0
|
||||
}
|
||||
minimum: 0,
|
||||
},
|
||||
},
|
||||
required: ["Type", "Bus", "Maximum power (MW)", "Cost ($/MW)"],
|
||||
},
|
||||
},
|
||||
required: ["Type", "Bus", "Maximum power (MW)", "Cost ($/MW)"]
|
||||
|
||||
}
|
||||
}
|
||||
},
|
||||
Contingencies: {
|
||||
type: "object",
|
||||
@@ -331,36 +327,36 @@ export const schema = {
|
||||
"Affected lines": {
|
||||
type: "array",
|
||||
items: {
|
||||
type: "string"
|
||||
type: "string",
|
||||
},
|
||||
maxItems: 1,
|
||||
minItems: 1
|
||||
}
|
||||
minItems: 1,
|
||||
},
|
||||
},
|
||||
required: ["Affected lines"],
|
||||
},
|
||||
},
|
||||
required: ["Affected lines"]
|
||||
}
|
||||
}
|
||||
},
|
||||
type: "object",
|
||||
properties: {
|
||||
Parameters: {
|
||||
$ref: "#/definitions/Parameters"
|
||||
$ref: "#/definitions/Parameters",
|
||||
},
|
||||
Buses: {
|
||||
$ref: "#/definitions/Bus"
|
||||
$ref: "#/definitions/Bus",
|
||||
},
|
||||
"Transmission lines": {
|
||||
$ref: "#/definitions/TransmissionLines"
|
||||
$ref: "#/definitions/TransmissionLines",
|
||||
},
|
||||
"Storage units": {
|
||||
$ref: "#/definitions/StorageUnits"
|
||||
$ref: "#/definitions/StorageUnits",
|
||||
},
|
||||
"Generators": {
|
||||
$ref: "#/definitions/Generators"
|
||||
Generators: {
|
||||
$ref: "#/definitions/Generators",
|
||||
},
|
||||
Contingencies: {
|
||||
$ref: "#/definitions/Contingencies",
|
||||
},
|
||||
"Contingencies": {
|
||||
$ref: "#/definitions/Contingencies"
|
||||
}
|
||||
},
|
||||
required: ["Parameters"],
|
||||
};
|
||||
@@ -4,7 +4,7 @@
|
||||
* Released under the modified BSD license. See COPYING.md for more details.
|
||||
*/
|
||||
|
||||
import { schema } from './schema';
|
||||
import { schema } from "./schema";
|
||||
import Ajv from "ajv";
|
||||
|
||||
// Create Ajv instance with detailed debug options
|
||||
@@ -14,4 +14,8 @@ const ajv = new Ajv({
|
||||
$data: true,
|
||||
});
|
||||
|
||||
export interface ValidationError {
|
||||
message: string;
|
||||
}
|
||||
|
||||
export const validate = ajv.compile(schema);
|
||||
|
||||
@@ -10,191 +10,71 @@ export interface Buses {
|
||||
|
||||
export interface UnitCommitmentScenario {
|
||||
Parameters: {
|
||||
Version: string,
|
||||
"Power balance penalty ($/MW)": number,
|
||||
"Time horizon (h)": number,
|
||||
"Time step (min)": number,
|
||||
},
|
||||
Buses: Buses
|
||||
Version: string;
|
||||
"Power balance penalty ($/MW)": number;
|
||||
"Time horizon (h)": number;
|
||||
"Time step (min)": number;
|
||||
};
|
||||
Buses: Buses;
|
||||
}
|
||||
|
||||
export const BLANK_SCENARIO: UnitCommitmentScenario = {
|
||||
"Parameters": {
|
||||
"Version": "0.4",
|
||||
Parameters: {
|
||||
Version: "0.4",
|
||||
"Power balance penalty ($/MW)": 1000.0,
|
||||
"Time horizon (h)": 24,
|
||||
"Time step (min)": 60,
|
||||
},
|
||||
"Buses": {}
|
||||
Buses: {},
|
||||
};
|
||||
|
||||
export const TEST_SCENARIO: UnitCommitmentScenario = {
|
||||
"Parameters": {
|
||||
"Version": "0.4",
|
||||
Parameters: {
|
||||
Version: "0.4",
|
||||
"Power balance penalty ($/MW)": 1000.0,
|
||||
"Time horizon (h)": 36,
|
||||
"Time step (min)": 60,
|
||||
},
|
||||
"Buses": {
|
||||
"b1": {
|
||||
Buses: {
|
||||
b1: {
|
||||
"Load (MW)": [
|
||||
35.79534,
|
||||
34.38835,
|
||||
33.45083,
|
||||
32.89729,
|
||||
33.25044,
|
||||
33.93851,
|
||||
35.8654,
|
||||
37.27098,
|
||||
38.08378,
|
||||
38.99327,
|
||||
38.65134,
|
||||
38.83212,
|
||||
37.60031,
|
||||
37.27939,
|
||||
37.11823,
|
||||
37.73063,
|
||||
40.951,
|
||||
44.77115,
|
||||
43.67527,
|
||||
44.40959,
|
||||
44.33812,
|
||||
42.29071,
|
||||
40.07654,
|
||||
37.42093,
|
||||
35.61175,
|
||||
34.28185,
|
||||
32.74174,
|
||||
33.17336,
|
||||
33.5181,
|
||||
35.63558,
|
||||
38.12722,
|
||||
39.61689,
|
||||
40.80105,
|
||||
42.55277,
|
||||
42.76017,
|
||||
42.12535
|
||||
]
|
||||
35.79534, 34.38835, 33.45083, 32.89729, 33.25044, 33.93851, 35.8654,
|
||||
37.27098, 38.08378, 38.99327, 38.65134, 38.83212, 37.60031, 37.27939,
|
||||
37.11823, 37.73063, 40.951, 44.77115, 43.67527, 44.40959, 44.33812,
|
||||
42.29071, 40.07654, 37.42093, 35.61175, 34.28185, 32.74174, 33.17336,
|
||||
33.5181, 35.63558, 38.12722, 39.61689, 40.80105, 42.55277, 42.76017,
|
||||
42.12535,
|
||||
],
|
||||
},
|
||||
"b2": {
|
||||
b2: {
|
||||
"Load (MW)": [
|
||||
14.03739,
|
||||
13.48563,
|
||||
13.11797,
|
||||
12.9009,
|
||||
13.03939,
|
||||
13.30922,
|
||||
14.06486,
|
||||
14.61607,
|
||||
14.93482,
|
||||
15.29148,
|
||||
15.15739,
|
||||
15.22828,
|
||||
14.74522,
|
||||
14.61937,
|
||||
14.55617,
|
||||
14.79633,
|
||||
16.05921,
|
||||
17.55731,
|
||||
17.12756,
|
||||
17.41553,
|
||||
17.3875,
|
||||
16.58459,
|
||||
15.71629,
|
||||
14.67487,
|
||||
13.96539,
|
||||
13.44386,
|
||||
12.8399,
|
||||
13.00916,
|
||||
13.14435,
|
||||
13.97474,
|
||||
14.95185,
|
||||
15.53603,
|
||||
16.00041,
|
||||
16.68736,
|
||||
16.76869,
|
||||
16.51974
|
||||
]
|
||||
14.03739, 13.48563, 13.11797, 12.9009, 13.03939, 13.30922, 14.06486,
|
||||
14.61607, 14.93482, 15.29148, 15.15739, 15.22828, 14.74522, 14.61937,
|
||||
14.55617, 14.79633, 16.05921, 17.55731, 17.12756, 17.41553, 17.3875,
|
||||
16.58459, 15.71629, 14.67487, 13.96539, 13.44386, 12.8399, 13.00916,
|
||||
13.14435, 13.97474, 14.95185, 15.53603, 16.00041, 16.68736, 16.76869,
|
||||
16.51974,
|
||||
],
|
||||
},
|
||||
"b3": {
|
||||
b3: {
|
||||
"Load (MW)": [
|
||||
27.3729,
|
||||
26.29698,
|
||||
25.58005,
|
||||
25.15675,
|
||||
25.4268,
|
||||
25.95298,
|
||||
27.42649,
|
||||
28.50134,
|
||||
29.12289,
|
||||
29.81839,
|
||||
29.55691,
|
||||
29.69515,
|
||||
28.75318,
|
||||
28.50777,
|
||||
28.38453,
|
||||
28.85284,
|
||||
31.31547,
|
||||
34.23676,
|
||||
33.39874,
|
||||
33.96028,
|
||||
33.90562,
|
||||
32.33996,
|
||||
30.64676,
|
||||
28.61601,
|
||||
27.23252,
|
||||
26.21553,
|
||||
25.0378,
|
||||
25.36786,
|
||||
25.63149,
|
||||
27.25074,
|
||||
29.15611,
|
||||
30.29527,
|
||||
31.2008,
|
||||
32.54035,
|
||||
32.69895,
|
||||
32.2135
|
||||
]
|
||||
27.3729, 26.29698, 25.58005, 25.15675, 25.4268, 25.95298, 27.42649,
|
||||
28.50134, 29.12289, 29.81839, 29.55691, 29.69515, 28.75318, 28.50777,
|
||||
28.38453, 28.85284, 31.31547, 34.23676, 33.39874, 33.96028, 33.90562,
|
||||
32.33996, 30.64676, 28.61601, 27.23252, 26.21553, 25.0378, 25.36786,
|
||||
25.63149, 27.25074, 29.15611, 30.29527, 31.2008, 32.54035, 32.69895,
|
||||
32.2135,
|
||||
],
|
||||
},
|
||||
"b4": {
|
||||
b4: {
|
||||
"Load (MW)": [
|
||||
27.3729,
|
||||
26.29698,
|
||||
25.58005,
|
||||
25.15675,
|
||||
25.4268,
|
||||
25.95298,
|
||||
27.42649,
|
||||
28.50134,
|
||||
29.12289,
|
||||
29.81839,
|
||||
29.55691,
|
||||
29.69515,
|
||||
28.75318,
|
||||
28.50777,
|
||||
28.38453,
|
||||
28.85284,
|
||||
31.31547,
|
||||
34.23676,
|
||||
33.39874,
|
||||
33.96028,
|
||||
33.90562,
|
||||
32.33996,
|
||||
30.64676,
|
||||
28.61601,
|
||||
27.23252,
|
||||
26.21553,
|
||||
25.0378,
|
||||
25.36786,
|
||||
25.63149,
|
||||
27.25074,
|
||||
29.15611,
|
||||
30.29527,
|
||||
31.2008,
|
||||
32.54035,
|
||||
32.69895,
|
||||
32.2135
|
||||
]
|
||||
27.3729, 26.29698, 25.58005, 25.15675, 25.4268, 25.95298, 27.42649,
|
||||
28.50134, 29.12289, 29.81839, 29.55691, 29.69515, 28.75318, 28.50777,
|
||||
28.38453, 28.85284, 31.31547, 34.23676, 33.39874, 33.96028, 33.90562,
|
||||
32.33996, 30.64676, 28.61601, 27.23252, 26.21553, 25.0378, 25.36786,
|
||||
25.63149, 27.25074, 29.15611, 30.29527, 31.2008, 32.54035, 32.69895,
|
||||
32.2135,
|
||||
],
|
||||
},
|
||||
},
|
||||
}
|
||||
};
|
||||
|
||||
@@ -4,19 +4,19 @@
|
||||
* Released under the modified BSD license. See COPYING.md for more details.
|
||||
*/
|
||||
|
||||
import React from 'react';
|
||||
import ReactDOM from 'react-dom/client';
|
||||
import reportWebVitals from './reportWebVitals';
|
||||
import React from "react";
|
||||
import ReactDOM from "react-dom/client";
|
||||
import reportWebVitals from "./reportWebVitals";
|
||||
import CaseBuilder from "./components/CaseBuilder/CaseBuilder";
|
||||
|
||||
const root = ReactDOM.createRoot(
|
||||
document.getElementById('root') as HTMLElement
|
||||
document.getElementById("root") as HTMLElement,
|
||||
);
|
||||
|
||||
root.render(
|
||||
<React.StrictMode>
|
||||
<CaseBuilder/>
|
||||
</React.StrictMode>
|
||||
<CaseBuilder />
|
||||
</React.StrictMode>,
|
||||
);
|
||||
|
||||
reportWebVitals();
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
* Released under the modified BSD license. See COPYING.md for more details.
|
||||
*/
|
||||
|
||||
import {ReportHandler} from 'web-vitals';
|
||||
import { ReportHandler } from "web-vitals";
|
||||
|
||||
const reportWebVitals = (onPerfEntry?: ReportHandler) => {
|
||||
if (onPerfEntry && onPerfEntry instanceof Function) {
|
||||
import('web-vitals').then(({getCLS, getFID, getFCP, getLCP, getTTFB}) => {
|
||||
import("web-vitals").then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
|
||||
getCLS(onPerfEntry);
|
||||
getFID(onPerfEntry);
|
||||
getFCP(onPerfEntry);
|
||||
|
||||
@@ -4,4 +4,4 @@
|
||||
* Released under the modified BSD license. See COPYING.md for more details.
|
||||
*/
|
||||
|
||||
import '@testing-library/jest-dom';
|
||||
import "@testing-library/jest-dom";
|
||||
|
||||
@@ -1,11 +1,7 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"target": "es5",
|
||||
"lib": [
|
||||
"dom",
|
||||
"dom.iterable",
|
||||
"esnext"
|
||||
],
|
||||
"lib": ["dom", "dom.iterable", "esnext"],
|
||||
"allowJs": false,
|
||||
"allowSyntheticDefaultImports": true,
|
||||
"alwaysStrict": true,
|
||||
@@ -35,7 +31,5 @@
|
||||
"noUnusedParameters": false,
|
||||
"checkJs": true
|
||||
},
|
||||
"include": [
|
||||
"src"
|
||||
]
|
||||
"include": ["src"]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user