web/src/components/CaseBuilder/Buses/Buses.tsx

@@ -16,23 +16,22 @@ import FileUploadElement from "../../Common/Buttons/FileUploadElement";
 import { useRef } from "react";
 import { ValidationError } from "../../../core/Validation/validate";
 import DataTable, {
+  addNameColumn,
+  addTimeseriesColumn,
   ColumnSpec,
   generateCsv,
   generateTableColumns,
   generateTableData,
-  parseCsv,
 } from "../../Common/Forms/DataTable";
 
 import { UnitCommitmentScenario } from "../../../core/fixtures";
 import { ColumnDefinition } from "tabulator-tables";
-import {
-  changeBusData,
-  createBus,
-  deleteBus,
-  renameBus,
-} from "../../../core/Operations/busOperations";
+import { parseBusesCsv } from "./BusesCsv";
 
-export const BusesColumnSpec: ColumnSpec[] = [
+export const generateBusesData = (
+  scenario: UnitCommitmentScenario,
+): [any[], ColumnDefinition[]] => {
+  const colSpecs: ColumnSpec[] = [
     {
       title: "Name",
       type: "string",
@@ -43,19 +42,32 @@ export const BusesColumnSpec: ColumnSpec[] = [
       type: "number[]",
       width: 60,
     },
-];
+  ];
+  const columns = generateTableColumns(scenario, colSpecs);
+  const data = generateTableData(scenario.Buses, colSpecs, scenario);
+  return [data, columns];
+};
 
-export const generateBusesData = (
+export const generateBusesColumns = (
   scenario: UnitCommitmentScenario,
-): [any[], ColumnDefinition[]] => {
-  const columns = generateTableColumns(scenario, BusesColumnSpec);
-  const data = generateTableData(scenario.Buses, BusesColumnSpec, scenario);
-  return [data, columns];
+): ColumnDefinition[] => {
+  const columns: ColumnDefinition[] = [];
+  addNameColumn(columns);
+  addTimeseriesColumn(scenario, "Load (MW)", columns);
+  return columns;
 };
+
 interface BusesProps {
   scenario: UnitCommitmentScenario;
+  onBusCreated: () => void;
+  onBusDataChanged: (
+    bus: string,
+    field: string,
+    newValue: string,
+  ) => ValidationError | null;
+  onBusDeleted: (bus: string) => ValidationError | null;
+  onBusRenamed: (oldName: string, newName: string) => ValidationError | null;
   onDataChanged: (scenario: UnitCommitmentScenario) => void;
-  onError: (msg: string) => void;
 }
 
 function BusesComponent(props: BusesProps) {
@@ -69,70 +81,19 @@ function BusesComponent(props: BusesProps) {
 
   const onUpload = () => {
     fileUploadElem.current!.showFilePicker((csvContents: any) => {
-      const [newBuses, err] = parseCsv(
-        csvContents,
-        BusesColumnSpec,
-        props.scenario,
-      );
-      if (err) {
-        props.onError(err.message);
-        return;
-      }
-      const newScenario = {
-        ...props.scenario,
-        Buses: newBuses,
-      };
+      const newScenario = parseBusesCsv(props.scenario, csvContents);
       props.onDataChanged(newScenario);
     });
   };
 
-  const onAdd = () => {
-    const newScenario = createBus(props.scenario);
-    props.onDataChanged(newScenario);
-  };
-
-  const onDataChanged = (
-    bus: string,
-    field: string,
-    newValue: string,
-  ): ValidationError | null => {
-    const [newScenario, err] = changeBusData(
-      bus,
-      field,
-      newValue,
-      props.scenario,
-    );
-    if (err) {
-      props.onError(err.message);
-      return err;
-    }
-    props.onDataChanged(newScenario);
-    return null;
-  };
-
-  const onDelete = (bus: string): ValidationError | null => {
-    const newScenario = deleteBus(bus, props.scenario);
-    props.onDataChanged(newScenario);
-    return null;
-  };
-
-  const onRename = (
-    oldName: string,
-    newName: string,
-  ): ValidationError | null => {
-    const [newScenario, err] = renameBus(oldName, newName, props.scenario);
-    if (err) {
-      props.onError(err.message);
-      return err;
-    }
-    props.onDataChanged(newScenario);
-    return null;
-  };
-
   return (
     <div>
       <SectionHeader title="Buses">
-        <SectionButton icon={faPlus} tooltip="Add" onClick={onAdd} />
+        <SectionButton
+          icon={faPlus}
+          tooltip="Add"
+          onClick={props.onBusCreated}
+        />
         <SectionButton
           icon={faDownload}
           tooltip="Download"
@@ -141,9 +102,9 @@ function BusesComponent(props: BusesProps) {
         <SectionButton icon={faUpload} tooltip="Upload" onClick={onUpload} />
       </SectionHeader>
       <DataTable
-        onRowDeleted={onDelete}
-        onRowRenamed={onRename}
-        onDataChanged={onDataChanged}
+        onRowDeleted={props.onBusDeleted}
+        onRowRenamed={props.onBusRenamed}
+        onDataChanged={props.onBusDataChanged}
         generateData={() => generateBusesData(props.scenario)}
       />
       <FileUploadElement ref={fileUploadElem} accept=".csv" />

web/src/components/CaseBuilder/Buses/BusesCsv.ts

@@ -0,0 +1,64 @@
+/*
+ * 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 { Buses, UnitCommitmentScenario } from "../../../core/fixtures";
+import Papa from "papaparse";
+import { generateBusesColumns } from "./Buses";
+
+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(),
+  });
+
+  // Check for parsing errors
+  if (results.errors.length > 0) {
+    throw Error(`Invalid CSV: Parsing error: ${results.errors}`);
+  }
+
+  // Check CSV headers
+  const expectedFields = generateBusesColumns(scenario).map(
+    (col) => col.field,
+  )!;
+  const actualFields = results.meta.fields!;
+  for (let i = 0; i < expectedFields.length; i++) {
+    if (expectedFields[i] !== actualFields[i]) {
+      throw Error(`Invalid CSV: Header mismatch at column ${i + 1}"`);
+    }
+  }
+
+  // Parse each row
+  const T = getNumTimesteps(scenario);
+  const buses: Buses = {};
+  for (let i = 0; i < results.data.length; i++) {
+    const row = results.data[i] as { [key: string]: any };
+    const busName = row["Name"] as string;
+    const busLoad: number[] = Array(T);
+    for (let j = 0; j < T; j++) {
+      busLoad[j] = parseFloat(row[`Load ${j}`]);
+    }
+    buses[busName] = {
+      "Load (MW)": busLoad,
+    };
+  }
+  return {
+    ...scenario,
+    Buses: buses,
+  };
+};
+
+function getNumTimesteps(scenario: UnitCommitmentScenario) {
+  return (
+    (scenario.Parameters["Time horizon (h)"] *
+      scenario.Parameters["Time step (min)"]) /
+    60
+  );
+}

web/src/components/CaseBuilder/CaseBuilder.tsx

@@ -17,8 +17,19 @@ import "tabulator-tables/dist/css/tabulator.min.css";
 import "../Common/Forms/Tables.css";
 import { useState } from "react";
 import Footer from "./Footer";
-import { validate } from "../../core/Validation/validate";
+import { validate, ValidationError } from "../../core/Validation/validate";
 import { offerDownload } from "../Common/io";
+import {
+  changeBusData,
+  createBus,
+  deleteBus,
+  renameBus,
+} from "../../core/Operations/busOperations";
+import {
+  changeParameter,
+  changeTimeHorizon,
+  changeTimeStep,
+} from "../../core/Operations/parameterOperations";
 import { preprocess } from "../../core/Operations/preprocessing";
 import Toast from "../Common/Forms/Toast";
 import ProfiledUnitsComponent from "./ProfiledUnits/ProfiledUnits";
@@ -48,10 +59,50 @@ const CaseBuilder = () => {
     );
   };
 
+  const onBusCreated = () => {
+    const newScenario = createBus(scenario);
+    setAndSaveScenario(newScenario);
+  };
+
+  const onBusDataChanged = (
+    bus: string,
+    field: string,
+    newValue: string,
+  ): ValidationError | null => {
+    const [newScenario, err] = changeBusData(bus, field, newValue, scenario);
+    if (err) {
+      setToastMessage(err.message);
+      return err;
+    }
+    setAndSaveScenario(newScenario);
+    return null;
+  };
+
+  const onBusDeleted = (bus: string): ValidationError | null => {
+    const newScenario = deleteBus(bus, scenario);
+    setAndSaveScenario(newScenario);
+    return null;
+  };
+
+  const onBusRenamed = (
+    oldName: string,
+    newName: string,
+  ): ValidationError | null => {
+    const [newScenario, err] = renameBus(oldName, newName, scenario);
+    if (err) {
+      setToastMessage(err.message);
+      return err;
+    }
+    setAndSaveScenario(newScenario);
+    return null;
+  };
+
   const onDataChanged = (newScenario: UnitCommitmentScenario) => {
     setAndSaveScenario(newScenario);
   };
 
+  const onProfiledUnitCreated = () => {};
+
   const onLoad = (scenario: UnitCommitmentScenario) => {
     const preprocessed = preprocess(
       scenario,
@@ -68,24 +119,42 @@ const CaseBuilder = () => {
     setToastMessage("Data loaded successfully");
   };
 
+  const onParameterChanged = (key: string, value: string) => {
+    let newScenario, err;
+    if (key === "Time horizon (h)") {
+      [newScenario, err] = changeTimeHorizon(scenario, value);
+    } else if (key === "Time step (min)") {
+      [newScenario, err] = changeTimeStep(scenario, value);
+    } else {
+      [newScenario, err] = changeParameter(scenario, key, value);
+    }
+    if (err) {
+      setToastMessage(err.message);
+      return err;
+    }
+    setAndSaveScenario(newScenario);
+    return null;
+  };
+
   return (
     <div>
       <Header onClear={onClear} onSave={onSave} onLoad={onLoad} />
       <div className="content">
         <Parameters
+          onParameterChanged={onParameterChanged}
           scenario={scenario}
-          onDataChanged={onDataChanged}
-          onError={setToastMessage}
         />
         <Buses
           scenario={scenario}
+          onBusCreated={onBusCreated}
+          onBusDataChanged={onBusDataChanged}
+          onBusRenamed={onBusRenamed}
+          onBusDeleted={onBusDeleted}
           onDataChanged={onDataChanged}
-          onError={setToastMessage}
         />
         <ProfiledUnitsComponent
           scenario={scenario}
-          onDataChanged={onDataChanged}
-          onError={setToastMessage}
+          onProfiledUnitCreated={onProfiledUnitCreated}
         />
         <Toast message={toastMessage} />
       </div>

web/src/components/CaseBuilder/Parameters/Parameters.tsx

@@ -8,36 +8,14 @@ import SectionHeader from "../../Common/SectionHeader/SectionHeader";
 import Form from "../../Common/Forms/Form";
 import TextInputRow from "../../Common/Forms/TextInputRow";
 import { UnitCommitmentScenario } from "../../../core/fixtures";
-import {
-  changeParameter,
-  changeTimeHorizon,
-  changeTimeStep,
-} from "../../../core/Operations/parameterOperations";
+import { ValidationError } from "../../../core/Validation/validate";
 
 interface ParametersProps {
   scenario: UnitCommitmentScenario;
-  onError: (msg: string) => void;
-  onDataChanged: (scenario: UnitCommitmentScenario) => void;
+  onParameterChanged: (key: string, value: string) => ValidationError | null;
 }
 
 function Parameters(props: ParametersProps) {
-  const onDataChanged = (key: string, value: string) => {
-    let newScenario, err;
-    if (key === "Time horizon (h)") {
-      [newScenario, err] = changeTimeHorizon(props.scenario, value);
-    } else if (key === "Time step (min)") {
-      [newScenario, err] = changeTimeStep(props.scenario, value);
-    } else {
-      [newScenario, err] = changeParameter(props.scenario, key, value);
-    }
-    if (err) {
-      props.onError(err.message);
-      return err;
-    }
-    props.onDataChanged(newScenario);
-    return null;
-  };
-
   return (
     <div>
       <SectionHeader title="Parameters"></SectionHeader>
@@ -47,21 +25,23 @@ function Parameters(props: ParametersProps) {
           unit="h"
           tooltip="Length of the planning horizon (in hours)."
           initialValue={`${props.scenario.Parameters["Time horizon (h)"]}`}
-          onChange={(v) => onDataChanged("Time horizon (h)", v)}
+          onChange={(v) => props.onParameterChanged("Time horizon (h)", v)}
         />
         <TextInputRow
           label="Time step"
           unit="min"
           tooltip="Length of each time step (in minutes). Must be a divisor of 60 (e.g. 60, 30, 20, 15, etc)."
           initialValue={`${props.scenario.Parameters["Time step (min)"]}`}
-          onChange={(v) => onDataChanged("Time step (min)", v)}
+          onChange={(v) => props.onParameterChanged("Time step (min)", v)}
         />
         <TextInputRow
           label="Power balance penalty"
           unit="$/MW"
           tooltip="Penalty for system-wide shortage or surplus in production (in /MW). This is charged per time step. For example, if there is a shortage of 1 MW for three time steps, three times this amount will be charged."
           initialValue={`${props.scenario.Parameters["Power balance penalty ($/MW)"]}`}
-          onChange={(v) => onDataChanged("Power balance penalty ($/MW)", v)}
+          onChange={(v) =>
+            props.onParameterChanged("Power balance penalty ($/MW)", v)
+          }
         />
       </Form>
     </div>

web/src/components/CaseBuilder/ProfiledUnits/ProfiledUnits.tsx

@@ -16,22 +16,20 @@ import DataTable, {
   generateCsv,
   generateTableColumns,
   generateTableData,
-  parseCsv,
 } from "../../Common/Forms/DataTable";
 import { UnitCommitmentScenario } from "../../../core/fixtures";
 import { ColumnDefinition } from "tabulator-tables";
 import { offerDownload } from "../../Common/io";
-import FileUploadElement from "../../Common/Buttons/FileUploadElement";
-import { useRef } from "react";
-import { createProfiledUnit } from "../../../core/Operations/profiledUnitOps";
 
 interface ProfiledUnitsProps {
   scenario: UnitCommitmentScenario;
-  onDataChanged: (scenario: UnitCommitmentScenario) => void;
-  onError: (msg: string) => void;
+  onProfiledUnitCreated: () => void;
 }
 
-const ProfiledUnitsColumnSpec: ColumnSpec[] = [
+const generateProfiledUnitsData = (
+  scenario: UnitCommitmentScenario,
+): [any[], ColumnDefinition[]] => {
+  const colSpecs: ColumnSpec[] = [
     {
       title: "Name",
       type: "string",
@@ -57,61 +55,27 @@ const ProfiledUnitsColumnSpec: ColumnSpec[] = [
       type: "number[]",
       width: 60,
     },
-];
-
-const generateProfiledUnitsData = (
-  scenario: UnitCommitmentScenario,
-): [any[], ColumnDefinition[]] => {
-  const columns = generateTableColumns(scenario, ProfiledUnitsColumnSpec);
-  const data = generateTableData(
-    scenario.Generators,
-    ProfiledUnitsColumnSpec,
-    scenario,
-  );
+  ];
+  const columns = generateTableColumns(scenario, colSpecs);
+  const data = generateTableData(scenario.Generators, colSpecs, scenario);
   return [data, columns];
 };
 
 const ProfiledUnitsComponent = (props: ProfiledUnitsProps) => {
-  const fileUploadElem = useRef<FileUploadElement>(null);
-
   const onDownload = () => {
     const [data, columns] = generateProfiledUnitsData(props.scenario);
     const csvContents = generateCsv(data, columns);
     offerDownload(csvContents, "text/csv", "profiled_units.csv");
   };
-
-  const onUpload = () => {
-    fileUploadElem.current!.showFilePicker((csvContents: any) => {
-      const [newGenerators, err] = parseCsv(
-        csvContents,
-        ProfiledUnitsColumnSpec,
-        props.scenario,
-      );
-      if (err) {
-        props.onError(err.message);
-        return;
-      }
-      const newScenario = {
-        ...props.scenario,
-        Generators: newGenerators,
-      };
-      props.onDataChanged(newScenario);
-    });
-  };
-
-  const onAdd = () => {
-    const [newScenario, err] = createProfiledUnit(props.scenario);
-    if (err) {
-      props.onError(err.message);
-      return;
-    }
-    props.onDataChanged(newScenario);
-  };
-
+  const onUpload = () => {};
   return (
     <div>
       <SectionHeader title="Profiled Units">
-        <SectionButton icon={faPlus} tooltip="Add" onClick={onAdd} />
+        <SectionButton
+          icon={faPlus}
+          tooltip="Add"
+          onClick={props.onProfiledUnitCreated}
+        />
         <SectionButton
           icon={faDownload}
           tooltip="Download"
@@ -131,7 +95,6 @@ const ProfiledUnitsComponent = (props: ProfiledUnitsProps) => {
         }}
         generateData={() => generateProfiledUnitsData(props.scenario)}
       />
-      <FileUploadElement ref={fileUploadElem} accept=".csv" />
     </div>
   );
 };

web/src/components/Common/Forms/DataTable.test.ts

@@ -5,15 +5,13 @@
  */
 
 import assert from "node:assert";
-import {
-  BusesColumnSpec,
-  generateBusesData,
-} from "../../CaseBuilder/Buses/Buses";
-import { generateCsv, parseCsv } from "./DataTable";
-import { TEST_DATA_1 } from "../../../core/fixtures.test";
+import { BUS_TEST_DATA_1 } from "../../../core/Operations/busOperations.test";
+import { parseBusesCsv } from "../../CaseBuilder/Buses/BusesCsv";
+import { generateBusesData } from "../../CaseBuilder/Buses/Buses";
+import { generateCsv } from "./DataTable";
 
 test("generate CSV", () => {
-  const [data, columns] = generateBusesData(TEST_DATA_1);
+  const [data, columns] = generateBusesData(BUS_TEST_DATA_1);
   const actualCsv = generateCsv(data, columns);
   const expectedCsv =
     "Name,Load (MW) 00:00,Load (MW) 01:00,Load (MW) 02:00,Load (MW) 03:00,Load (MW) 04:00\n" +
@@ -23,19 +21,38 @@ test("generate CSV", () => {
   assert.strictEqual(actualCsv, expectedCsv);
 });
 
-test("parse CSV", () => {
+test("parse valid CSV", () => {
+  // const csvContents =
+  //   "Name,Load 0,Load 1,Load 2,Load 3,Load 4\n" +
+  //   "b1,0,1,2,3,4\n" +
+  //   "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],
+  //   },
+  //   b3: {
+  //     "Load (MW)": [27.3729, 26.29698, 25.58005, 25.15675, 25.4268],
+  //   },
+  // });
+});
+
+test("parse invalid CSV (wrong headers)", () => {
   const csvContents =
-    "Name,Load (MW) 00:00,Load (MW) 01:00,Load (MW) 02:00,Load (MW) 03:00,Load (MW) 04:00\n" +
+    "Name,Load 5,Load 7,Load 23,Load 3,Load 4\n" +
     "b1,0,1,2,3,4\n" +
     "b3,27.3729,26.29698,25.58005,25.15675,25.4268";
-  const [newBuses, err] = parseCsv(csvContents, BusesColumnSpec, TEST_DATA_1);
-  assert(err === null);
-  assert.deepEqual(newBuses, {
-    b1: {
-      "Load (MW)": [0, 1, 2, 3, 4],
-    },
-    b3: {
-      "Load (MW)": [27.3729, 26.29698, 25.58005, 25.15675, 25.4268],
-    },
-  });
+  expect(() => {
+    parseBusesCsv(BUS_TEST_DATA_1, csvContents);
+  }).toThrow(Error);
+});
+
+test("parse invalid CSV (wrong data length)", () => {
+  const csvContents =
+    "Name,Load 0,Load 1,Load 2,Load 3,Load 4\n" +
+    "b1,0,1,2,3\n" +
+    "b3,27.3729,26.29698,25.58005,25.15675,25.4268";
+  expect(() => {
+    parseBusesCsv(BUS_TEST_DATA_1, csvContents);
+  }).toThrow(Error);
 });

web/src/components/Common/Forms/DataTable.tsx

@@ -12,7 +12,6 @@ import {
 } from "tabulator-tables";
 import { ValidationError } from "../../../core/Validation/validate";
 import { UnitCommitmentScenario } from "../../../core/fixtures";
-import Papa from "papaparse";
 
 export interface ColumnSpec {
   title: string;
@@ -127,87 +126,19 @@ export const generateCsv = (data: any[], columns: ColumnDefinition[]) => {
   return `${csvHeader}\n${csvBody}`;
 };
 
-export const parseCsv = (
-  csvContents: string,
-  colSpecs: ColumnSpec[],
-  scenario: UnitCommitmentScenario,
-): [any, ValidationError | null] => {
-  // Parse contents
-  const csv = Papa.parse(csvContents, {
-    header: true,
-    skipEmptyLines: true,
-    transformHeader: (header) => header.trim(),
-    transform: (value) => value.trim(),
-  });
-
-  // Check for parsing errors
-  if (csv.errors.length > 0) {
-    console.error(csv.errors);
-    return [null, { message: "Could not parse CSV file" }];
-  }
-
-  // Check CSV headers
-  const columns = generateTableColumns(scenario, colSpecs);
-  const expectedHeader: string[] = [];
-  columns.forEach((column) => {
-    if (column.columns) {
-      column.columns.forEach((subcolumn) => {
-        expectedHeader.push(subcolumn.field!);
-      });
-    } else {
-      expectedHeader.push(column.field!);
-    }
-  });
-  const actualHeader = csv.meta.fields!;
-  for (let i = 0; i < expectedHeader.length; i++) {
-    if (expectedHeader[i] !== actualHeader[i]) {
-      return [
-        null,
-        {
-          message: `Invalid CSV: Header mismatch at column ${i + 1}. 
-          Expected "${expectedHeader[i]}", found "${actualHeader[i]}"`,
-        },
-      ];
-    }
-  }
-
-  // Parse each row
-  const timeslots = generateTimeslots(scenario);
-  const data: { [key: string]: any } = {};
-  for (let i = 0; i < csv.data.length; i++) {
-    const row = csv.data[i] as { [key: string]: any };
-    const name = row["Name"] as string;
-    data[name] = {};
-
-    for (const spec of colSpecs) {
-      if (spec.title === "Name") continue;
-      switch (spec.type) {
-        case "string":
-        case "number":
-          data[name][spec.title] = row[spec.title];
-          break;
-        case "number[]":
-          data[name][spec.title] = Array(timeslots.length);
-
-          for (let i = 0; i < timeslots.length; i++) {
-            data[name][spec.title][i] = parseFloat(
-              row[`${spec.title} ${timeslots[i]}`],
-            );
-          }
-          break;
-        default:
-          console.error(`Unknown type: ${spec.type}`);
-      }
-    }
-  }
-
-  return [data, null];
-};
-
 export const floatFormatter = (cell: CellComponent) => {
   return parseFloat(cell.getValue()).toFixed(1);
 };
 
+export const addNameColumn = (columns: ColumnDefinition[]) => {
+  columns.push({
+    ...columnsCommonAttrs,
+    title: "Name",
+    field: "Name",
+    minWidth: 150,
+  });
+};
+
 export const generateTimeslots = (scenario: UnitCommitmentScenario) => {
   const timeHorizonHours = scenario["Parameters"]["Time horizon (h)"];
   const timeStepMin = scenario["Parameters"]["Time step (min)"];
@@ -225,6 +156,29 @@ export const generateTimeslots = (scenario: UnitCommitmentScenario) => {
   return timeslots;
 };
 
+export const addTimeseriesColumn = (
+  scenario: UnitCommitmentScenario,
+  title: string,
+  columns: ColumnDefinition[],
+  minWidth: number = 65,
+) => {
+  const timeSlots = generateTimeslots(scenario);
+  const subColumns: ColumnDefinition[] = [];
+  timeSlots.forEach((t) => {
+    subColumns.push({
+      ...columnsCommonAttrs,
+      title: `${t}`,
+      field: `${title} ${t}`,
+      minWidth: minWidth,
+      formatter: floatFormatter,
+    });
+  });
+  columns.push({
+    title: title,
+    columns: subColumns,
+  });
+};
+
 export const columnsCommonAttrs: ColumnDefinition = {
   headerHozAlign: "left",
   hozAlign: "left",

web/src/core/Operations/busOperations.test.ts

@@ -4,6 +4,7 @@
  * Released under the modified BSD license. See COPYING.md for more details.
  */
 
+import { UnitCommitmentScenario } from "../fixtures";
 import {
   changeBusData,
   createBus,
@@ -11,59 +12,111 @@ import {
   renameBus,
 } from "./busOperations";
 import assert from "node:assert";
-import { TEST_DATA_1 } from "../fixtures.test";
+
+export const BUS_TEST_DATA_1: UnitCommitmentScenario = {
+  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] },
+  },
+};
+
+export const BUS_TEST_DATA_2: UnitCommitmentScenario = {
+  Parameters: {
+    Version: "0.4",
+    "Power balance penalty ($/MW)": 1000.0,
+    "Time horizon (h)": 2,
+    "Time step (min)": 30,
+  },
+  Buses: {
+    b1: { "Load (MW)": [30, 30, 30, 30] },
+    b2: { "Load (MW)": [10, 20, 30, 40] },
+    b3: { "Load (MW)": [0, 30, 0, 40] },
+  },
+};
 
 test("createBus", () => {
-  const newScenario = createBus(TEST_DATA_1);
+  const newScenario = createBus(BUS_TEST_DATA_1);
   assert.deepEqual(Object.keys(newScenario.Buses), ["b1", "b2", "b3", "b4"]);
 });
 
 test("changeBusData", () => {
-  let scenario = TEST_DATA_1;
+  let scenario = BUS_TEST_DATA_1;
   let err = null;
 
-  [scenario, err] = changeBusData("b1", "Load (MW) 00:00", "99", scenario);
+  [scenario, err] = changeBusData("b1", "Load 0", "99", scenario);
   assert.equal(err, null);
-  [scenario, err] = changeBusData("b1", "Load (MW) 03:00", "99", scenario);
+
+  [scenario, err] = changeBusData("b1", "Load 3", "99", scenario);
   assert.equal(err, null);
 
-  [scenario, err] = changeBusData("b3", "Load (MW) 04:00", "99", scenario);
+  [scenario, err] = changeBusData("b3", "Load 4", "99", scenario);
   assert.equal(err, null);
 
-  assert.deepEqual(scenario.Buses, {
+  assert.deepEqual(scenario, {
+    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] },
+    },
   });
 });
 
 test("changeBusData with invalid numbers", () => {
-  let [, err] = changeBusData("b1", "Load (MW) 00:00", "xx", TEST_DATA_1);
+  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 = TEST_DATA_1;
+  let scenario = BUS_TEST_DATA_1;
   scenario = deleteBus("b2", scenario);
-  assert.deepEqual(scenario.Buses, {
+  assert.deepEqual(scenario, {
+    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] },
+    },
   });
 });
 
 test("renameBus", () => {
-  let [scenario, err] = renameBus("b2", "b99", TEST_DATA_1);
+  let [scenario, err] = renameBus("b2", "b99", BUS_TEST_DATA_1);
   assert(err === null);
-  assert.deepEqual(scenario.Buses, {
+  assert.deepEqual(scenario, {
+    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] },
+    },
   });
 });
 
 test("renameBus with duplicated name", () => {
-  let [, err] = renameBus("b3", "b1", TEST_DATA_1);
+  let [, err] = renameBus("b3", "b1", BUS_TEST_DATA_1);
   assert(err != null);
   assert.equal(err.message, `Bus b1 already exists`);
 });

web/src/core/Operations/busOperations.ts

@@ -6,27 +6,34 @@
 
 import { Buses, UnitCommitmentScenario } from "../fixtures";
 import { ValidationError } from "../Validation/validate";
-import { generateTimeslots } from "../../components/Common/Forms/DataTable";
 
-export const generateUniqueName = (container: any, prefix: string): string => {
+const generateUniqueBusName = (scenario: UnitCommitmentScenario) => {
+  let newBusName = "b";
   let counter = 1;
-  let name = `${prefix}${counter}`;
-  while (name in container) {
+  let name = `${newBusName}${counter}`;
+  while (name in scenario.Buses) {
     counter++;
-    name = `${prefix}${counter}`;
+    name = `${newBusName}${counter}`;
   }
   return name;
 };
 
+const generateDefaultBusLoad = (scenario: UnitCommitmentScenario) => {
+  const T =
+    scenario.Parameters["Time horizon (h)"] *
+    (60 / scenario.Parameters["Time step (min)"]);
+  return new Array(T).fill(0);
+};
+
 export const createBus = (scenario: UnitCommitmentScenario) => {
-  const name = generateUniqueName(scenario.Buses, "b");
-  const timeslots = generateTimeslots(scenario);
+  const load = generateDefaultBusLoad(scenario);
+  let name = generateUniqueBusName(scenario);
   return {
     ...scenario,
     Buses: {
       ...scenario.Buses,
       [name]: {
-        "Load (MW)": Array(timeslots.length).fill(0),
+        "Load (MW)": load,
       },
     },
   };
@@ -39,18 +46,13 @@ export const changeBusData = (
   scenario: UnitCommitmentScenario,
 ): [UnitCommitmentScenario, ValidationError | null] => {
   // Load (MW)
-  const match = field.match(/Load \(MW\) (\d+):(\d+)/);
+  const match = field.match(/Load (\d+)/);
   if (match) {
     const newValueFloat = parseFloat(newValueStr);
     if (isNaN(newValueFloat)) {
       return [scenario, { message: `Invalid value: ${newValueStr}` }];
     }
-
-    // Convert HH:MM to offset
-    const hours = parseInt(match[1]!, 10);
-    const min = parseInt(match[2]!, 10);
-    const idx = (hours * 60 + min) / scenario.Parameters["Time step (min)"];
-
+    const idx = parseInt(match[1]!, 10);
     const newLoad = [...scenario.Buses[bus]!["Load (MW)"]];
     newLoad[idx] = newValueFloat;
     return [

web/src/core/Operations/parameterOperations.test.ts

@@ -9,27 +9,29 @@ import {
   changeTimeStep,
   evaluatePwlFunction,
 } from "./parameterOperations";
+import { BUS_TEST_DATA_1, BUS_TEST_DATA_2 } from "./busOperations.test";
 import assert from "node:assert";
-import { TEST_DATA_1, TEST_DATA_2 } from "../fixtures.test";
 
 test("changeTimeHorizon: Shrink 1", () => {
-  const [newScenario, err] = changeTimeHorizon(TEST_DATA_1, "3");
+  const [newScenario, err] = changeTimeHorizon(BUS_TEST_DATA_1, "3");
   assert(err === null);
-  assert.deepEqual(newScenario.Parameters, {
+  assert.deepEqual(newScenario, {
+    Parameters: {
       Version: "0.4",
       "Power balance penalty ($/MW)": 1000.0,
       "Time horizon (h)": 3,
       "Time step (min)": 60,
-  });
-  assert.deepEqual(newScenario.Buses, {
+    },
+    Buses: {
       b1: { "Load (MW)": [35.79534, 34.38835, 33.45083] },
       b2: { "Load (MW)": [14.03739, 13.48563, 13.11797] },
       b3: { "Load (MW)": [27.3729, 26.29698, 25.58005] },
+    },
   });
 });
 
 test("changeTimeHorizon: Shrink 2", () => {
-  const [newScenario, err] = changeTimeHorizon(TEST_DATA_2, "1");
+  const [newScenario, err] = changeTimeHorizon(BUS_TEST_DATA_2, "1");
   assert(err === null);
   assert.deepEqual(newScenario, {
     Parameters: {
@@ -47,15 +49,16 @@ test("changeTimeHorizon: Shrink 2", () => {
 });
 
 test("changeTimeHorizon grow", () => {
-  const [newScenario, err] = changeTimeHorizon(TEST_DATA_1, "7");
+  const [newScenario, err] = changeTimeHorizon(BUS_TEST_DATA_1, "7");
   assert(err === null);
-  assert.deepEqual(newScenario.Parameters, {
+  assert.deepEqual(newScenario, {
+    Parameters: {
       Version: "0.4",
       "Power balance penalty ($/MW)": 1000.0,
       "Time horizon (h)": 7,
       "Time step (min)": 60,
-  });
-  assert.deepEqual(newScenario.Buses, {
+    },
+    Buses: {
       b1: {
         "Load (MW)": [35.79534, 34.38835, 33.45083, 32.89729, 33.25044, 0, 0],
       },
@@ -65,15 +68,16 @@ test("changeTimeHorizon grow", () => {
       b3: {
         "Load (MW)": [27.3729, 26.29698, 25.58005, 25.15675, 25.4268, 0, 0],
       },
+    },
   });
 });
 
 test("changeTimeHorizon invalid", () => {
-  let [, err] = changeTimeHorizon(TEST_DATA_1, "x");
+  let [, err] = changeTimeHorizon(BUS_TEST_DATA_1, "x");
   assert(err !== null);
   assert.equal(err.message, "Invalid value: x");
 
-  [, err] = changeTimeHorizon(TEST_DATA_1, "-3");
+  [, err] = changeTimeHorizon(BUS_TEST_DATA_1, "-3");
   assert(err !== null);
   assert.equal(err.message, "Invalid value: -3");
 });
@@ -89,7 +93,7 @@ test("evaluatePwlFunction", () => {
 });
 
 test("changeTimeStep", () => {
-  let [scenario, err] = changeTimeStep(TEST_DATA_2, "15");
+  let [scenario, err] = changeTimeStep(BUS_TEST_DATA_2, "15");
   assert(err === null);
   assert.deepEqual(scenario, {
     Parameters: {
@@ -105,7 +109,7 @@ test("changeTimeStep", () => {
     },
   });
 
-  [scenario, err] = changeTimeStep(TEST_DATA_2, "60");
+  [scenario, err] = changeTimeStep(BUS_TEST_DATA_2, "60");
   assert(err === null);
   assert.deepEqual(scenario, {
     Parameters: {
@@ -123,19 +127,19 @@ test("changeTimeStep", () => {
 });
 
 test("changeTimeStep invalid", () => {
-  let [, err] = changeTimeStep(TEST_DATA_2, "x");
+  let [, err] = changeTimeStep(BUS_TEST_DATA_2, "x");
   assert(err !== null);
   assert.equal(err.message, "Invalid value: x");
 
-  [, err] = changeTimeStep(TEST_DATA_2, "-10");
+  [, err] = changeTimeStep(BUS_TEST_DATA_2, "-10");
   assert(err !== null);
   assert.equal(err.message, "Invalid value: -10");
 
-  [, err] = changeTimeStep(TEST_DATA_2, "120");
+  [, err] = changeTimeStep(BUS_TEST_DATA_2, "120");
   assert(err !== null);
   assert.equal(err.message, "Invalid value: 120");
 
-  [, err] = changeTimeStep(TEST_DATA_2, "7");
+  [, err] = changeTimeStep(BUS_TEST_DATA_2, "7");
   assert(err !== null);
   assert.equal(err.message, "Time step must be a divisor of 60: 7");
 });

web/src/core/Operations/profiledUnitOps.test.ts

@@ -1,36 +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 { TEST_DATA_1, TEST_DATA_BLANK } from "../fixtures.test";
-import assert from "node:assert";
-import { createProfiledUnit } from "./profiledUnitOps";
-
-test("createUnit", () => {
-  const [newScenario, err] = createProfiledUnit(TEST_DATA_1);
-  assert(err === null);
-  assert.deepEqual(newScenario.Generators, {
-    pu1: {
-      Bus: "b1",
-      Type: "Profiled",
-      "Cost ($/MW)": 12.5,
-      "Maximum power (MW)": [10, 12, 13, 15, 20],
-      "Minimum power (MW)": [0, 0, 0, 0, 0],
-    },
-    pu2: {
-      Bus: "b1",
-      Type: "Profiled",
-      "Cost ($/MW)": 0,
-      "Maximum power (MW)": [0, 0, 0, 0, 0],
-      "Minimum power (MW)": [0, 0, 0, 0, 0],
-    },
-  });
-});
-
-test("createUnit with blank file", () => {
-  const [newScenario, err] = createProfiledUnit(TEST_DATA_BLANK);
-  assert(err !== null);
-  assert.equal(err.message, "Profiled unit requires an existing bus.");
-});

web/src/core/Operations/profiledUnitOps.ts

@@ -1,37 +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 { UnitCommitmentScenario } from "../fixtures";
-import { generateTimeslots } from "../../components/Common/Forms/DataTable";
-import { generateUniqueName } from "./busOperations";
-import { ValidationError } from "../Validation/validate";
-
-export const createProfiledUnit = (
-  scenario: UnitCommitmentScenario,
-): [UnitCommitmentScenario, ValidationError | null] => {
-  const busNames = Object.keys(scenario.Buses);
-  if (busNames.length === 0) {
-    return [scenario, { message: "Profiled unit requires an existing bus." }];
-  }
-  const timeslots = generateTimeslots(scenario);
-  const name = generateUniqueName(scenario.Generators, "pu");
-  return [
-    {
-      ...scenario,
-      Generators: {
-        ...scenario.Generators,
-        [name]: {
-          Bus: busNames[0]!,
-          Type: "Profiled",
-          "Cost ($/MW)": 0,
-          "Minimum power (MW)": Array(timeslots.length).fill(0),
-          "Maximum power (MW)": Array(timeslots.length).fill(0),
-        },
-      },
-    },
-    null,
-  ];
-};

web/src/core/fixtures.test.ts

@@ -1,51 +0,0 @@
-import { UnitCommitmentScenario } from "./fixtures";
-
-export const TEST_DATA_1: UnitCommitmentScenario = {
-  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] },
-  },
-  Generators: {
-    pu1: {
-      Bus: "b1",
-      Type: "Profiled",
-      "Cost ($/MW)": 12.5,
-      "Maximum power (MW)": [10, 12, 13, 15, 20],
-      "Minimum power (MW)": [0, 0, 0, 0, 0],
-    },
-  },
-};
-
-export const TEST_DATA_2: UnitCommitmentScenario = {
-  Parameters: {
-    Version: "0.4",
-    "Power balance penalty ($/MW)": 1000.0,
-    "Time horizon (h)": 2,
-    "Time step (min)": 30,
-  },
-  Buses: {
-    b1: { "Load (MW)": [30, 30, 30, 30] },
-    b2: { "Load (MW)": [10, 20, 30, 40] },
-    b3: { "Load (MW)": [0, 30, 0, 40] },
-  },
-};
-
-export const TEST_DATA_BLANK: UnitCommitmentScenario = {
-  Parameters: {
-    Version: "0.4",
-    "Power balance penalty ($/MW)": 1000.0,
-    "Time horizon (h)": 5,
-    "Time step (min)": 60,
-  },
-  Buses: {},
-  Generators: {},
-};
-
-test("fixtures", () => {});