diff --git a/javasrc/org/hd/d/TRVmodel/hg/ShowComputations.java b/javasrc/org/hd/d/TRVmodel/hg/ShowComputations.java index 2390b51..ac37a2c 100644 --- a/javasrc/org/hd/d/TRVmodel/hg/ShowComputations.java +++ b/javasrc/org/hd/d/TRVmodel/hg/ShowComputations.java @@ -177,13 +177,13 @@ public static String generateHTMLMainSummaryTable() throws IOException Summary of change with selected-room setback\s\ of whole-home heat demand and of heat-pump electrical demand\s\ in high and low internal loss room setback arrangements for 1- and 2- storey (bungalow and detached)\s\ - home configurations for %d UK locations\ + home configurations for %d UK locations, hourly temperature data for years 201X.\ """, DDNTemperatureDataCSV.DESCRIPTORS_201X_DATASET.size())); result.append(""" \ - Location / Weather StationArchetype\ + Location (Weather Station)Archetype\ Home Heat Demand delta\ ABAB heat-pump demand delta\ AABB heat-pump demand delta\ @@ -203,7 +203,7 @@ public static String generateHTMLMainSummaryTable() throws IOException { result.append(""); if(!detached) - { result.append(String.format("%s (weather station at %s)", htdd.conurbation(), htdd.station())); } + { result.append(String.format("%s (%s)", htdd.conurbation(), htdd.station())); } final String archetype = detached ? "detached" : "bungalow"; result.append(String.format("%s", archetype)); @@ -218,7 +218,22 @@ public static String generateHTMLMainSummaryTable() throws IOException final HGTRVHPMModelByHour scenario201X = new HGTRVHPMModelByHour( modelParameters, temperatures201X); - + final ScenarioResult result201X = scenario201X.runScenario(detached); + final double heatNoSetback201X = result201X.demand().noSetback().heatDemand(); + final double heatWithSetback201X = result201X.demand().withSetback().heatDemand(); + // Overall home heat demand is not affected by room setback layout, so only show once. + final double heatDelta201X = 100*((heatWithSetback201X/heatNoSetback201X)-1); + if(abab) + { result.append(String.format("%.1f%%", heatDelta201X)); } + +// System.out.println(String.format(" Heat mean demand: with no setback %.0fW, with setback %.0fW; %.0f%% change with setback", +// heatNoSetback201X, heatWithSetback201X, 100*((heatWithSetback201X/heatNoSetback201X)-1))); +// final double powerNoSetback201X = result201X.demand().noSetback().heatPumpElectricity(); +// final double powerWithSetback201X = result201X.demand().withSetback().heatPumpElectricity(); +// System.out.println(String.format(" Heat pump mean power: with no setback %.0fW, with setback %.0fW; %.0f%% change with setback", +// powerNoSetback201X, powerWithSetback201X, 100*((powerWithSetback201X/powerNoSetback201X)-1))); +// System.out.println(String.format(" Percentage of hours that room setback raises heat pump demand: %.0f%%", +// 100f * result201X.hoursFractionSetbackRaisesDemand())); // TODO