Pass home battery data to resourcefully

Erikvv · Erikvv · commit 7f18ad24a23e · 2025-11-24T12:39:28.000+01:00
diff --git a/webtool/frontend/src/components/cost/cost-section.tsx b/webtool/frontend/src/components/cost/cost-section.tsx
@@ -95,7 +95,7 @@ const CostHeading = () => (
     </Heading>
 );
 
-const defaultGenerationCost = AssetCost.Companion.createForGenerationAsset()
+const defaultGenerationCost = AssetCost.createForGenerationAsset()
 
 export const CostSection: FunctionComponent<{
     showCostPerKwh?: boolean
diff --git a/webtool/frontend/src/components/household/household-form.tsx b/webtool/frontend/src/components/household/household-form.tsx
@@ -55,7 +55,7 @@ export const HouseholdForm: FunctionComponent<{
                 </div>
                 <div className="radix-grid" style={useContext(IsDevModeContext) ? {} : { display: "none" }}>
                     <LabelWithInfo data={titles["hasHomeBattery_r"]} />
-                    <input className="form-input" type="number" id="hasHomeBattery_r" name="hasHomeBattery_r" defaultValue={(initialData?.hasHomeBattery_r || 0.0) * 100} min={0} max={100} />
+                    <input className="form-input" type="number" id="hasHomeBattery_r" name="hasHomeBattery_r" defaultValue={getWithDefault(initialData?.hasHomeBattery_r, 0.01) * 100} min={0} max={100} />
                 </div>
                 <div className="radix-grid">
                     <LabelWithInfo data={titles["annualBaseConsumptionAvg_kWh"]} />
diff --git a/webtool/frontend/src/components/resourcefully/content.tsx b/webtool/frontend/src/components/resourcefully/content.tsx
@@ -4,7 +4,7 @@ import {ResourcefullyExport, createExport, ExportMetadata} from "local4local"
 import {Pilot} from "local4local"
 import {createDeeplink} from "../deeplink.ts"
 import Animation = AnyLogicCloudClient.Animation
-import {getCoopReport} from "./preview.ts"
+import {getCoopReport, getHouseholdGroupReports} from "./preview.ts"
 import {PilotState} from "../../services/use-pilot.ts"
 import {DialogButtonRow} from "./DialogButtonRow.tsx"
 
@@ -18,8 +18,9 @@ async function createExportObject(submitEvent: ReactSubmitEvent, pilot: Pilot, a
     );
 
     const coopReport = await getCoopReport(anyLogicAnimation)
+    const householdGroupReports = await getHouseholdGroupReports(anyLogicAnimation)
 
-    return createExport(pilot, exportMetadata, createDeeplink(pilot), coopReport)
+    return createExport(pilot, exportMetadata, createDeeplink(pilot), coopReport, householdGroupReports)
 }
 
 export const ResourcefullyDialogContent: FunctionComponent<{
diff --git a/webtool/frontend/src/components/resourcefully/preview.ts b/webtool/frontend/src/components/resourcefully/preview.ts
@@ -1,5 +1,11 @@
+import {householdGroupReportListFromJson, KtList, HouseholdGroupReport} from "local4local"
 import Animation = AnyLogicCloudClient.Animation
 
 export async function getCoopReport(anyLogicAnimation: Animation) {
     return await anyLogicAnimation.callFunction("experiment.root.f_getCoopReport", [])
 }
+
+export async function getHouseholdGroupReports(anyLogicAnimation: Animation): Promise<KtList<HouseholdGroupReport>> {
+    const res = await anyLogicAnimation.callFunction("experiment.root.f_getHouseholdGroupAssets", [])
+    return householdGroupReportListFromJson(JSON.stringify(res))
+}
diff --git a/webtool/frontend/src/components/wind-farm/wind-farm.tsx b/webtool/frontend/src/components/wind-farm/wind-farm.tsx
@@ -88,7 +88,7 @@ export const WindFarmForm: FunctionComponent<{
                     <LabelWithInfo data={windFarmTitles.curtailment} />
                     <input type="checkbox" id="curtailment" name="curtailment" defaultChecked={initialData?.curtailment} />
                 </div>
-                <CostSection initialData={initialData?.cost ?? AssetCost.Companion.createForGenerationAsset()}/>
+                <CostSection initialData={initialData?.cost ?? AssetCost.createForGenerationAsset()}/>
                 <Button onClick={hide} style={{ marginRight: '10px' }} highContrast variant="soft">Annuleren</Button>
                 <Button type="submit">Opslaan</Button>
             </form>
diff --git a/webtool/gradle/build.gradle.kts b/webtool/gradle/build.gradle.kts
@@ -2,4 +2,4 @@ plugins {
     kotlin("multiplatform") version libs.versions.kotlin apply false
     kotlin("jvm") version libs.versions.kotlin apply false
     kotlin("plugin.serialization") version libs.versions.kotlin apply false
-}
+}
diff --git a/webtool/gradle/client/build/libs/local4local-client.jar b/webtool/gradle/client/build/libs/local4local-client.jar
diff --git a/webtool/gradle/common/build.gradle.kts b/webtool/gradle/common/build.gradle.kts
@@ -21,7 +21,7 @@ kotlin {
         binaries.library()
         compilations["main"].packageJson {
             // hack hack hack
-            types = "kotlin/local4local-common.d.ts"
+            types = "kotlin/local4local-common.d.mts"
         }
         browser {
         }
@@ -33,7 +33,7 @@ kotlin {
         }
         val commonMain by getting {
             dependencies {
-                implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.1")
+                implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0")
             }
         }
     }
diff --git a/webtool/gradle/common/src/commonMain/kotlin/Json.kt b/webtool/gradle/common/src/commonMain/kotlin/Json.kt
@@ -0,0 +1,8 @@
+package nu.local4local.common
+
+import kotlinx.serialization.json.Json
+
+val json = Json {
+    encodeDefaults = true
+    prettyPrint = true
+}
diff --git a/webtool/gradle/common/src/commonMain/kotlin/Pilot.kt b/webtool/gradle/common/src/commonMain/kotlin/Pilot.kt
@@ -4,6 +4,7 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import kotlin.js.JsExport
 import kotlin.js.JsName
+import kotlin.js.JsStatic
 import kotlin.math.roundToInt
 
 var idCounter = 1
@@ -133,6 +134,7 @@ data class AssetCost(
     val OPEX_eurpy: Double? = 0.0,
 ) {
     companion object {
+        @JsStatic
         fun createForGenerationAsset(): AssetCost = AssetCost(
             sdeAanvraagbedrag_eurpkWh = 0.10,
             sdeBasisenergieprijs_eurpkWh = 0.04,
diff --git a/webtool/gradle/common/src/commonMain/kotlin/coopreport/HouseholdGroupReport.kt b/webtool/gradle/common/src/commonMain/kotlin/coopreport/HouseholdGroupReport.kt
@@ -0,0 +1,77 @@
+package nu.local4local.common.coopreport
+
+import kotlinx.serialization.Serializable
+import nu.local4local.common.json
+import kotlin.js.JsExport
+import kotlin.jvm.JvmStatic
+
+@JsExport
+fun householdGroupReportListFromJson(jsonString: String): List<HouseholdGroupReport> = json.decodeFromString(jsonString)
+
+@JsExport
+@Serializable
+data class HouseholdGroupReport(
+    val id: String,
+    val avgPvSystemPower_kWp: Double,
+    val avgHomeBatteryCapacity_kWh: Double,
+    val avgHomeBatteryPower_kW: Double,
+    val pvHouseholdsWithHomeBattery_fr: Double,
+    val nonPvHouseholdsWithHomeBattery_fr: Double,
+) {
+    @JsExport.Ignore
+    companion object {
+        @JvmStatic
+        fun listToJson(list: List<HouseholdGroupReport>): String = json.encodeToString(list)
+    }
+
+    @JsExport.Ignore
+    class Builder {
+        var id: String? = null
+            private set
+        var avgPvSystemPower_kWp: Double? = null
+            private set
+        var avgHomeBatteryCapacity_kWh: Double? = null
+            private set
+        var avgHomeBatteryPower_kW: Double? = null
+            private set
+        var pvHouseholdsWithHomeBattery_fr: Double? = null
+            private set
+        var nonPvHouseholdsWithHomeBattery_fr: Double? = null
+            private set
+
+        fun build() = HouseholdGroupReport(
+            id!!,
+            avgPvSystemPower_kWp!!,
+            avgHomeBatteryCapacity_kWh!!,
+            avgHomeBatteryPower_kW!!,
+            pvHouseholdsWithHomeBattery_fr!!,
+            nonPvHouseholdsWithHomeBattery_fr!!,
+        )
+
+        fun id(id: String) = apply {
+            this.id = id
+        }
+
+        fun avgPvSystemPower_kWp(avgPvSystemPower_kWp: Double) = apply {
+            this.avgPvSystemPower_kWp = avgPvSystemPower_kWp
+        }
+
+        fun avgHomeBatteryCapacity_kWh(avgHomeBatteryCapacity_kWh: Double) = apply {
+            this.avgHomeBatteryCapacity_kWh = avgHomeBatteryCapacity_kWh
+        }
+
+        fun avgHomeBatteryPower_kW(avgHomeBatteryPower_kW: Double) = apply {
+            this.avgHomeBatteryPower_kW = avgHomeBatteryPower_kW
+        }
+
+        fun pvHouseholdsWithHomeBattery_fr(pvHouseholdsWithHomeBattery_fr: Double) = apply {
+            this.pvHouseholdsWithHomeBattery_fr = pvHouseholdsWithHomeBattery_fr
+        }
+
+        fun nonPvHouseholdsWithHomeBattery_fr(nonPvHouseholdsWithHomeBattery_fr: Double) = apply {
+            this.nonPvHouseholdsWithHomeBattery_fr = nonPvHouseholdsWithHomeBattery_fr
+        }
+    }
+
+    fun toJson(): String = json.encodeToString(this)
+}
diff --git a/webtool/gradle/common/src/commonMain/kotlin/resourcefully/Export.kt b/webtool/gradle/common/src/commonMain/kotlin/resourcefully/Export.kt
@@ -3,6 +3,7 @@ package nu.local4local.common.resourcefully
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import nu.local4local.common.*
+import nu.local4local.common.coopreport.HouseholdGroupReport
 import kotlin.js.JsExport
 
 /**
@@ -50,11 +51,7 @@ data class ResourcefullyExport(
     /** Simulation output */
     var coopReport: AnnualCoopReport? = null,
 ) {
-    fun toJson(): String =
-        Json {
-            encodeDefaults = true
-            prettyPrint = true
-        }.encodeToString(this)
+    fun toJson(): String = json.encodeToString(this)
 }
 
 @JsExport
@@ -80,20 +77,37 @@ data class HouseholdGroup(
      * Simulation results.
      * I don't think we have these available yet on a per-group basis.
      */
+
+    // ratio of household with a home battery but no PV
+    val batt_ratio: Double,
+    // ratio of household with a home battery and PV
+    val batt_pv_ratio: Double,
+    // kW
+    val batt_power: Double,
+    // kWh
+    val batt_capacity: Double,
     //val annualElectricityConsumption_kWh: Double,
     //val annualElectricityProduction_kWh: Double,
     //val annualElectricityDelivery_kWh: Double,
     //val annualElectricityFeedIn_kWh: Double,
 ) {
     companion object {
-        fun create(householdGroup: nu.local4local.common.HouseholdGroup) = with(householdGroup) {
+        fun create(
+            householdGroup: nu.local4local.common.HouseholdGroup,
+            reports: List<HouseholdGroupReport>,
+        ) = with(householdGroup) {
+            val report = reports.first { it.id == householdGroup.id }
             HouseholdGroup(
                 description = type,
                 households_n = households_n,
                 hasPV_n = hasPV_n(),
                 hasHeatPump_n = hasHeatPump_n(),
                 hasChargePoint_n = hasChargePoint_n(),
                 annualBaseConsumptionAvg_kWh = annualBaseConsumptionAvg_kWh,
+                batt_ratio = report.nonPvHouseholdsWithHomeBattery_fr,
+                batt_pv_ratio = report.pvHouseholdsWithHomeBattery_fr,
+                batt_power = report.avgHomeBatteryPower_kW,
+                batt_capacity = report.avgHomeBatteryCapacity_kWh,
             )
         }
     }
diff --git a/webtool/gradle/common/src/commonMain/kotlin/resourcefully/Mock.kt b/webtool/gradle/common/src/commonMain/kotlin/resourcefully/Mock.kt
@@ -30,6 +30,10 @@ val mockExport = ResourcefullyExport(
             hasHeatPump_n = 30,
             hasChargePoint_n = 20,
             annualBaseConsumptionAvg_kWh = 4500.0,
+            batt_ratio = 0.0,
+            batt_pv_ratio = 0.0,
+            batt_power = 0.0,
+            batt_capacity = 0.0,
         )
     ),
     companies = listOf(
diff --git a/webtool/gradle/common/src/jsMain/kotlin/resourcefully/Export.kt b/webtool/gradle/common/src/jsMain/kotlin/resourcefully/Export.kt
@@ -1,6 +1,7 @@
 package nu.local4local.common.resourcefully
 
 import nu.local4local.common.Pilot
+import nu.local4local.common.coopreport.HouseholdGroupReport
 import kotlin.js.collections.JsArray
 import kotlin.js.collections.toList
 
@@ -24,7 +25,9 @@ fun createAssetCostReport(anyLogicAssetCostReport: AnyLogicAssetCostReport): Ass
 
 @OptIn(ExperimentalJsCollectionsApi::class)
 @JsExport
-fun createExport(pilot: Pilot, metadata: ExportMetadata, scenarioUrl: String, coopReport: dynamic) = with(pilot) {
+fun createExport(pilot: Pilot, metadata: ExportMetadata, scenarioUrl: String, coopReport: dynamic, householdGroupReports: List<HouseholdGroupReport>) = with(pilot) {
+    console.log(householdGroupReports)
+
     val assetList: AssetList = (coopReport.assetList as JsArray<AnyLogicAssetCostReport>)
         .toList()
         .map { createAssetCostReport(it) }
@@ -36,7 +39,7 @@ fun createExport(pilot: Pilot, metadata: ExportMetadata, scenarioUrl: String, co
         email = metadata.email,
         scenarioUrl = scenarioUrl,
         supplierCost = supplierCost,
-        householdGroups = householdGroups.map { HouseholdGroup.create(it) },
+        householdGroups = householdGroups.map { HouseholdGroup.create(it, householdGroupReports) },
         companies = companies.map { Company.create(it) },
         windFarms = windFarms.map { WindFarm.create(it, assetList) },
         solarFarms = solarFarms.map { SolarFarm.create(it, assetList) },
diff --git a/webtool/gradle/gradle/wrapper/gradle-wrapper.properties b/webtool/gradle/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/webtool/gradle/kotlin-js-store/yarn.lock b/webtool/gradle/kotlin-js-store/yarn.lock
diff --git a/webtool/gradle/settings.gradle.kts b/webtool/gradle/settings.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ kotlin {`
`21`	`21`	`binaries.library()`
`22`	`22`	`compilations["main"].packageJson {`
`23`	`23`	`// hack hack hack`
`24`		`- types = "kotlin/local4local-common.d.ts"`
	`24`	`+ types = "kotlin/local4local-common.d.mts"`
`25`	`25`	`}`
`26`	`26`	`browser {`
`27`	`27`	`}`
`@@ -33,7 +33,7 @@ kotlin {`
`33`	`33`	`}`
`34`	`34`	`val commonMain by getting {`
`35`	`35`	`dependencies {`
`36`		`- implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.1")`
	`36`	`+ implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0")`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`	`}`