Skip to content

Fixes v2g data management and other cleanup #185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AteZenmo merged 3 commits into from
Aug 8, 2025
Merged

Fixes v2g data management and other cleanup #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ab6a53
fixing v2g data management and cleanup
AteZenmo Aug 7, 2025
5027591
Merge branch 'main' into fixes_v2g_dataManagement_and_other_cleanup
AteZenmo Aug 7, 2025
95394c8
final adjustments
AteZenmo Aug 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
474 changes: 4 additions & 470 deletions _alp/Agents/GCHouse/Code/Functions.java
View file
Open in desktop

Large diffs are not rendered by default.

165 changes: 4 additions & 161 deletions _alp/Agents/GCHouse/Code/Functions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Functions>
<Function AccessType="public" StaticFunction="false">
<ReturnModificator>VOID</ReturnModificator>
<ReturnType>double</ReturnType>
<Id>1664441996771</Id>
<Name><![CDATA[f_manageHeatingAssets_overwrite]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>920</X>
<Y>420</Y>
<Label>
<X>10</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Body xmlns:al="http://anylogic.com"/>
</Function>
<Function AccessType="public" StaticFunction="false">
<ReturnModificator>VOID</ReturnModificator>
<ReturnType>double</ReturnType>
Expand All @@ -33,35 +16,14 @@
<ShowLabel>true</ShowLabel>
<Body xmlns:al="http://anylogic.com"/>
</Function>
<Function AccessType="public" StaticFunction="false">
<ReturnModificator>VOID</ReturnModificator>
<ReturnType>double</ReturnType>
<Id>1665498948452</Id>
<Name><![CDATA[f_connectToChild_overwrite]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>820</X>
<Y>-100</Y>
<Label>
<X>10</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Parameter>
<Name><![CDATA[ConnectingParentNode]]></Name>
<Type><![CDATA[Agent]]></Type>
</Parameter>
<Body xmlns:al="http://anylogic.com"/>
</Function>
<Function AccessType="public" StaticFunction="false">
<ReturnModificator>VOID</ReturnModificator>
<ReturnType>double</ReturnType>
<Id>1669203453155</Id>
<Name><![CDATA[f_createThermalStorageModel]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>820</X>
<Y>-210</Y>
<X>940</X>
<Y>-90</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand Down Expand Up @@ -102,7 +64,7 @@
<Id>1675014184707</Id>
<Name><![CDATA[f_manageCharging_overwrite]]></Name>
<X>920</X>
<Y>440</Y>
<Y>310</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -119,7 +81,7 @@
<Name><![CDATA[f_simpleCharging_overwrite]]></Name>
<Description><![CDATA[Charging when arriving home, not taking grid limits into account]]></Description>
<X>940</X>
<Y>460</Y>
<Y>330</Y>
<Label>
<X>10</X>
<Y>0</Y>
Expand All @@ -146,40 +108,6 @@
<ShowLabel>true</ShowLabel>
<Body xmlns:al="http://anylogic.com"/>
</Function>
<Function AccessType="protected" StaticFunction="false">
<ReturnModificator>VOID</ReturnModificator>
<ReturnType>double</ReturnType>
<Id>1676477303264</Id>
<Name><![CDATA[f_heatWithHeatpump]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>1700</X>
<Y>110</Y>
<Label>
<X>10</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Body xmlns:al="http://anylogic.com"/>
</Function>
<Function AccessType="protected" StaticFunction="false">
<ReturnModificator>VOID</ReturnModificator>
<ReturnType>double</ReturnType>
<Id>1676976246060</Id>
<Name><![CDATA[f_heatWithHybridHeatpump]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>1700</X>
<Y>170</Y>
<Label>
<X>10</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Body xmlns:al="http://anylogic.com"/>
</Function>
<Function AccessType="public" StaticFunction="false">
<ReturnModificator>VOID</ReturnModificator>
<ReturnType>double</ReturnType>
Expand Down Expand Up @@ -270,40 +198,6 @@
<ShowLabel>true</ShowLabel>
<Body xmlns:al="http://anylogic.com"/>
</Function>
<Function AccessType="public" StaticFunction="false">
<ReturnModificator>VOID</ReturnModificator>
<ReturnType>double</ReturnType>
<Id>1702369252216</Id>
<Name><![CDATA[setHeatingTargetTemp]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>1700</X>
<Y>90</Y>
<Label>
<X>10</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Body xmlns:al="http://anylogic.com"/>
</Function>
<Function AccessType="public" StaticFunction="false">
<ReturnModificator>RETURNS_VALUE</ReturnModificator>
<ReturnType>boolean</ReturnType>
<Id>1702369294416</Id>
<Name><![CDATA[f_calcCheapestHeatingPrice]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>1720</X>
<Y>190</Y>
<Label>
<X>10</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Body xmlns:al="http://anylogic.com"/>
</Function>
<Function AccessType="default" StaticFunction="false">
<ReturnModificator>VOID</ReturnModificator>
<ReturnType>double</ReturnType>
Expand All @@ -321,40 +215,6 @@
<ShowLabel>true</ShowLabel>
<Body xmlns:al="http://anylogic.com"/>
</Function>
<Function AccessType="protected" StaticFunction="false">
<ReturnModificator>VOID</ReturnModificator>
<ReturnType>double</ReturnType>
<Id>1726301776809</Id>
<Name><![CDATA[f_heatWithGasburner]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>1700</X>
<Y>130</Y>
<Label>
<X>10</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Body xmlns:al="http://anylogic.com"/>
</Function>
<Function AccessType="protected" StaticFunction="false">
<ReturnModificator>VOID</ReturnModificator>
<ReturnType>double</ReturnType>
<Id>1726301785545</Id>
<Name><![CDATA[f_heatWithDistrictHeat]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>1700</X>
<Y>150</Y>
<Label>
<X>10</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Body xmlns:al="http://anylogic.com"/>
</Function>
<Function AccessType="protected" StaticFunction="false">
<ReturnModificator>VOID</ReturnModificator>
<ReturnType>double</ReturnType>
Expand Down Expand Up @@ -407,21 +267,4 @@
</Parameter>
<Body xmlns:al="http://anylogic.com"/>
</Function>
<Function AccessType="default" StaticFunction="false">
<ReturnModificator>VOID</ReturnModificator>
<ReturnType>double</ReturnType>
<Id>1752073360816</Id>
<Name><![CDATA[f_heatWithLTDistrictHeat]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>1700</X>
<Y>210</Y>
<Label>
<X>10</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Body xmlns:al="http://anylogic.com"/>
</Function>
</Functions>
69 changes: 0 additions & 69 deletions _alp/Agents/GCHouse/Variables.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,75 +202,6 @@
</InitialValue>
</Properties>
</Variable>
<Variable Class="PlainVariable">
<Id>1704447555067</Id>
<Name><![CDATA[v_currentIndoorTemp_degC]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>1460</X>
<Y>210</Y>
<Label>
<X>10</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Properties SaveInSnapshot="true"
Constant="false"
AccessType="public"
StaticVariable="false">
<Type><![CDATA[double]]></Type>
<InitialValue Class="CodeValue">
<Code><![CDATA[20]]></Code>
</InitialValue>
</Properties>
</Variable>
<Variable Class="PlainVariable">
<Id>1704447555069</Id>
<Name><![CDATA[v_dayTempSetpoint_degC1]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>1460</X>
<Y>-40</Y>
<Label>
<X>10</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Properties SaveInSnapshot="true"
Constant="false"
AccessType="public"
StaticVariable="false">
<Type><![CDATA[double]]></Type>
<InitialValue Class="CodeValue">
<Code><![CDATA[18]]></Code>
</InitialValue>
</Properties>
</Variable>
<Variable Class="PlainVariable">
<Id>1704447555071</Id>
<Name><![CDATA[v_nightTempSetpoint_degC1]]></Name>
<ExcludeFromBuild>true</ExcludeFromBuild>
<X>1460</X>
<Y>-20</Y>
<Label>
<X>10</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Properties SaveInSnapshot="true"
Constant="false"
AccessType="public"
StaticVariable="false">
<Type><![CDATA[double]]></Type>
<InitialValue Class="CodeValue">
<Code><![CDATA[18]]></Code>
</InitialValue>
</Properties>
</Variable>
<Variable Class="PlainVariable">
<Id>1704447555073</Id>
<Name><![CDATA[v_heatingOn_time]]></Name>
Expand Down
Loading