Skip to content

companyUI_small_cleanup+bugfix+update8.9.9 #298

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

Open
AteZenmo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

companyUI_small_cleanup+bugfix+update8.9.9 #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions Zero_Interface-Loader.alpx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<AnyLogicWorkspace splitVersion="1"
WorkspaceVersion="1.9"
AnyLogicVersion="8.9.7.202512010504"
AlpVersion="8.9.7">
AnyLogicVersion="8.9.9.202606170507"
AlpVersion="8.9.9">
<Model>
<Id>1658477103134</Id>
<Name><![CDATA[Zero_Interface-Loader]]></Name>
Expand Down Expand Up @@ -239,7 +239,6 @@
<FixedTimeStep>1.0</FixedTimeStep>
<RelativeAccuracy>1.0</RelativeAccuracy>
<TimeAccuracy>0.1</TimeAccuracy>
<InspectionWindowColorTheme>DEFAULT</InspectionWindowColorTheme>
<Frame>
<Id>1658477089982</Id>
<Width>1920</Width>
Expand Down Expand Up @@ -488,6 +487,7 @@
<Uuid>404652e6-561a-404c-aab2-ab7415f40ef5</Uuid>
<Uuid>6fd6cd57-6dfe-4fc6-be0b-c74065351957</Uuid>
<Uuid>3325dc48-3ad4-41e3-836f-dfd0e98fe1ed</Uuid>
<Uuid>bb27038a-0f3a-48bb-b235-4a44066a14aa</Uuid>
<Uuid>3f69ef3d-706e-41a6-8af0-11658c5eef68</Uuid>
<Uuid>3f6fe405-e047-4304-91d6-6eee206d1106</Uuid>
<Uuid>820d2b51-5b4a-48e7-b0b6-e46418e3c0f2</Uuid>
Expand Down Expand Up @@ -543,5 +543,9 @@
<Uuid>1737c8c6-b526-4dd8-589e-ee4e205b06f4</Uuid>
<Uuid>6a43bef6-8b70-4253-a828-82c3ab399655</Uuid>
<Uuid>0a27038a-0f3a-48bb-b235-4a44066a1402</Uuid>
<Uuid>0a9ec2c3-5e18-4c0a-a183-fd86d9d9a08b</Uuid>
<Uuid>2216cdd0-177c-5678-9e88-dd8b95313334</Uuid>
<Uuid>2216cdd0-177c-5678-9e88-dd8b95313335</Uuid>
<Uuid>5b8ebeed-6b58-4c3a-8d5f-0958b1a90ce6</Uuid>
</ConvertersApplied>
</AnyLogicWorkspace>
7 changes: 6 additions & 1 deletion _alp/Agents/AVGC_data/AOC.AVGC_data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,12 @@
<MakeDefaultViewArea>true</MakeDefaultViewArea>
<SceneGridColor/>
<SceneBackgroundColor>-4144960</SceneBackgroundColor>
<SceneSkybox>null</SceneSkybox>
<EnvironmentResourceRef/>
<EnvironmentType>NONE</EnvironmentType>
<EnvironmentRotationX>0</EnvironmentRotationX>
<EnvironmentRotationY>0</EnvironmentRotationY>
<EnvironmentRotationZ>0</EnvironmentRotationZ>
<EnvironmentIntensity>1</EnvironmentIntensity>
<AgentProperties>
<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
Expand Down
7 changes: 6 additions & 1 deletion _alp/Agents/UI_Battery/AOC.UI_Battery.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@
<MakeDefaultViewArea>true</MakeDefaultViewArea>
<SceneGridColor/>
<SceneBackgroundColor>-4144960</SceneBackgroundColor>
<SceneSkybox>null</SceneSkybox>
<EnvironmentResourceRef/>
<EnvironmentType>NONE</EnvironmentType>
<EnvironmentRotationX>0</EnvironmentRotationX>
<EnvironmentRotationY>0</EnvironmentRotationY>
<EnvironmentRotationZ>0</EnvironmentRotationZ>
<EnvironmentIntensity>1</EnvironmentIntensity>
<AgentProperties>
<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
Expand Down
7 changes: 6 additions & 1 deletion _alp/Agents/UI_EnergyHub/AOC.UI_EnergyHub.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,12 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;]]></Import>
<MakeDefaultViewArea>true</MakeDefaultViewArea>
<SceneGridColor/>
<SceneBackgroundColor>-4144960</SceneBackgroundColor>
<SceneSkybox>null</SceneSkybox>
<EnvironmentResourceRef/>
<EnvironmentType>NONE</EnvironmentType>
<EnvironmentRotationX>0</EnvironmentRotationX>
<EnvironmentRotationY>0</EnvironmentRotationY>
<EnvironmentRotationZ>0</EnvironmentRotationZ>
<EnvironmentIntensity>1</EnvironmentIntensity>
<AgentProperties>
<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
Expand Down
7 changes: 6 additions & 1 deletion _alp/Agents/UI_Hydrogen/AOC.UI_Hydrogen.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@
<MakeDefaultViewArea>true</MakeDefaultViewArea>
<SceneGridColor/>
<SceneBackgroundColor>-4144960</SceneBackgroundColor>
<SceneSkybox>null</SceneSkybox>
<EnvironmentResourceRef/>
<EnvironmentType>NONE</EnvironmentType>
<EnvironmentRotationX>0</EnvironmentRotationX>
<EnvironmentRotationY>0</EnvironmentRotationY>
<EnvironmentRotationZ>0</EnvironmentRotationZ>
<EnvironmentIntensity>1</EnvironmentIntensity>
<AgentProperties>
<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
Expand Down
7 changes: 6 additions & 1 deletion _alp/Agents/UI_Tabs/AOC.UI_Tabs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@
<MakeDefaultViewArea>true</MakeDefaultViewArea>
<SceneGridColor/>
<SceneBackgroundColor>-4144960</SceneBackgroundColor>
<SceneSkybox>null</SceneSkybox>
<EnvironmentResourceRef/>
<EnvironmentType>NONE</EnvironmentType>
<EnvironmentRotationX>0</EnvironmentRotationX>
<EnvironmentRotationY>0</EnvironmentRotationY>
<EnvironmentRotationZ>0</EnvironmentRotationZ>
<EnvironmentIntensity>1</EnvironmentIntensity>
<AgentProperties>
<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
Expand Down
7 changes: 6 additions & 1 deletion _alp/Agents/UI_company/AOC.UI_company.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,12 @@ f_initializeDayToDisableRectanglesMap();]]></StartupCode>
<MakeDefaultViewArea>true</MakeDefaultViewArea>
<SceneGridColor/>
<SceneBackgroundColor>-4144960</SceneBackgroundColor>
<SceneSkybox>null</SceneSkybox>
<EnvironmentResourceRef/>
<EnvironmentType>NONE</EnvironmentType>
<EnvironmentRotationX>0</EnvironmentRotationX>
<EnvironmentRotationY>0</EnvironmentRotationY>
<EnvironmentRotationZ>0</EnvironmentRotationZ>
<EnvironmentIntensity>1</EnvironmentIntensity>
<AgentProperties>
<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
Expand Down
33 changes: 12 additions & 21 deletions _alp/Agents/UI_company/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1469,31 +1469,21 @@ else if(setAmountOfVehicles < local_HydrogenV_nb){ // Slider has decreased the a
//Find the current heat saving percentage
int currentHeatSavings = 0;

J_EAConsumption consumptionEAHEAT = findFirst(p_gridConnection.c_consumptionAssets, consumptionAsset -> consumptionAsset.getEAType() == OL_EnergyAssetType.HEAT_DEMAND);
if (consumptionEAHEAT != null){
currentHeatSavings = roundToInt((consumptionEAHEAT.getConsumptionScaling_fr() - 1)*-100);
}
else{
J_EAProfile profileEAHEAT = findFirst(p_gridConnection.c_profileAssets, profileAsset -> profileAsset.getEnergyCarrier() == OL_EnergyCarriers.HEAT);
if (profileEAHEAT != null){
currentHeatSavings = roundToInt((profileEAHEAT.getProfileScaling_fr() - 1)*-100);
}
J_EAProfile profileEAHEAT = findFirst(p_gridConnection.c_profileAssets, profileAsset -> profileAsset.getEnergyCarrier() == OL_EnergyCarriers.HEAT);
if (profileEAHEAT != null){
currentHeatSavings = roundToInt((profileEAHEAT.getProfileScaling_fr() - 1)*-100);
}


//Find the current electricity savings percentage
int currentElectricitySavings = 0;

J_EAConsumption consumptionEAELECTRIC = findFirst(p_gridConnection.c_consumptionAssets, consumptionAsset -> consumptionAsset.getEAType() == OL_EnergyAssetType.ELECTRICITY_DEMAND);
if (consumptionEAELECTRIC != null){
currentElectricitySavings = roundToInt((consumptionEAELECTRIC.getConsumptionScaling_fr() - 1)*-100);
}
else{
J_EAProfile profileEAELECTRIC = findFirst(p_gridConnection.c_profileAssets, profileAsset -> profileAsset.getAssetFlowCategory() == OL_AssetFlowCategories.fixedConsumptionElectric_kW);
if (profileEAELECTRIC != null){
currentElectricitySavings = roundToInt((profileEAELECTRIC.getProfileScaling_fr() - 1)*-100);
}
J_EAProfile profileEAELECTRIC = findFirst(p_gridConnection.c_profileAssets, profileAsset -> profileAsset.getAssetFlowCategory() == OL_AssetFlowCategories.fixedConsumptionElectric_kW);
if (profileEAELECTRIC != null){
currentElectricitySavings = roundToInt((profileEAELECTRIC.getProfileScaling_fr() - 1)*-100);
}


//Find the current Connection capacity (delivery)
double GCContractCapacityCurrent_Delivery = p_gridConnection.v_liveConnectionMetaData.getDefaultContractedDeliveryCapacity_kW();

Expand All @@ -1512,11 +1502,12 @@ else if(setAmountOfVehicles < local_HydrogenV_nb){ // Slider has decreased the a

//Find the current PV capacity
int PVCapacityCurrent = 0;
if (p_gridConnection.v_liveAssetsMetaData.activeAssetFlows.contains(OL_AssetFlowCategories.pvProductionElectric_kW)){
J_EAProduction pvAsset = findFirst(p_gridConnection.c_productionAssets, p -> p.getEAType() == OL_EnergyAssetType.PHOTOVOLTAIC );
PVCapacityCurrent = roundToInt(pvAsset.getCapacityElectric_kW());
List<J_EAProduction> pvAssets = findAll(p_gridConnection.c_productionAssets, p -> p.getEAType() == OL_EnergyAssetType.PHOTOVOLTAIC );
for(J_EAProduction pvAsset : pvAssets){
PVCapacityCurrent += roundToInt(pvAsset.getCapacityElectric_kW());
}


//Find the current curtailment setting
boolean currentCurtailmentSetting = p_gridConnection.f_isAssetManagementActive(I_CurtailManagement.class);

Expand Down
7 changes: 6 additions & 1 deletion _alp/Agents/Z_UnusedAgent/AOC.Z_UnusedAgent.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@
<MakeDefaultViewArea>true</MakeDefaultViewArea>
<SceneGridColor/>
<SceneBackgroundColor>-4144960</SceneBackgroundColor>
<SceneSkybox>null</SceneSkybox>
<EnvironmentResourceRef/>
<EnvironmentType>NONE</EnvironmentType>
<EnvironmentRotationX>0</EnvironmentRotationX>
<EnvironmentRotationY>0</EnvironmentRotationY>
<EnvironmentRotationZ>0</EnvironmentRotationZ>
<EnvironmentIntensity>1</EnvironmentIntensity>
<AgentProperties>
<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
Expand Down
7 changes: 6 additions & 1 deletion _alp/Agents/Zero_Interface/AOC.Zero_Interface.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,12 @@ import javax.media.jai.widget.ViewportListener;
<MakeDefaultViewArea>true</MakeDefaultViewArea>
<SceneGridColor/>
<SceneBackgroundColor>-4144960</SceneBackgroundColor>
<SceneSkybox>null</SceneSkybox>
<EnvironmentResourceRef/>
<EnvironmentType>NONE</EnvironmentType>
<EnvironmentRotationX>0</EnvironmentRotationX>
<EnvironmentRotationY>0</EnvironmentRotationY>
<EnvironmentRotationZ>0</EnvironmentRotationZ>
<EnvironmentIntensity>1</EnvironmentIntensity>
<AgentProperties>
<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
Expand Down
2 changes: 1 addition & 1 deletion _alp/Agents/Zero_Interface/EmbeddedObjects.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@
</LocationNameCode>
<InitializationType>EMPTY</InitializationType>
<InitializationDatabaseTableQuery>
<Id>0</Id>
<Id>1658477069999</Id>
<TableReference/>
</InitializationDatabaseTableQuery>
<InitializationDatabaseType>ONE_AGENT_PER_DATABASE_RECORD</InitializationDatabaseType>
Expand Down
7 changes: 6 additions & 1 deletion _alp/Agents/Zero_Loader/AOC.Zero_Loader.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,12 @@ import com.zenmo.zummon.companysurvey.PVOrientation;]]></Import>
<MakeDefaultViewArea>true</MakeDefaultViewArea>
<SceneGridColor/>
<SceneBackgroundColor>-4144960</SceneBackgroundColor>
<SceneSkybox>null</SceneSkybox>
<EnvironmentResourceRef/>
<EnvironmentType>NONE</EnvironmentType>
<EnvironmentRotationX>0</EnvironmentRotationX>
<EnvironmentRotationY>0</EnvironmentRotationY>
<EnvironmentRotationZ>0</EnvironmentRotationZ>
<EnvironmentIntensity>1</EnvironmentIntensity>
<AgentProperties>
<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
Expand Down
7 changes: 6 additions & 1 deletion _alp/Agents/tabArea/AOC.tabArea.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@
<MakeDefaultViewArea>true</MakeDefaultViewArea>
<SceneGridColor/>
<SceneBackgroundColor>-4144960</SceneBackgroundColor>
<SceneSkybox>null</SceneSkybox>
<EnvironmentResourceRef/>
<EnvironmentType>NONE</EnvironmentType>
<EnvironmentRotationX>0</EnvironmentRotationX>
<EnvironmentRotationY>0</EnvironmentRotationY>
<EnvironmentRotationZ>0</EnvironmentRotationZ>
<EnvironmentIntensity>1</EnvironmentIntensity>
<AgentProperties>
<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
Expand Down
7 changes: 6 additions & 1 deletion _alp/Agents/tabEHub/AOC.tabEHub.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,12 @@
<MakeDefaultViewArea>true</MakeDefaultViewArea>
<SceneGridColor/>
<SceneBackgroundColor>-4144960</SceneBackgroundColor>
<SceneSkybox>null</SceneSkybox>
<EnvironmentResourceRef/>
<EnvironmentType>NONE</EnvironmentType>
<EnvironmentRotationX>0</EnvironmentRotationX>
<EnvironmentRotationY>0</EnvironmentRotationY>
<EnvironmentRotationZ>0</EnvironmentRotationZ>
<EnvironmentIntensity>1</EnvironmentIntensity>
<AgentProperties>
<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
Expand Down
7 changes: 6 additions & 1 deletion _alp/Agents/tabElectricity/AOC.tabElectricity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,12 @@
<MakeDefaultViewArea>true</MakeDefaultViewArea>
<SceneGridColor/>
<SceneBackgroundColor>-4144960</SceneBackgroundColor>
<SceneSkybox>null</SceneSkybox>
<EnvironmentResourceRef/>
<EnvironmentType>NONE</EnvironmentType>
<EnvironmentRotationX>0</EnvironmentRotationX>
<EnvironmentRotationY>0</EnvironmentRotationY>
<EnvironmentRotationZ>0</EnvironmentRotationZ>
<EnvironmentIntensity>1</EnvironmentIntensity>
<AgentProperties>
<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
Expand Down
7 changes: 6 additions & 1 deletion _alp/Agents/tabHeating/AOC.tabHeating.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,12 @@
<MakeDefaultViewArea>true</MakeDefaultViewArea>
<SceneGridColor/>
<SceneBackgroundColor>-4144960</SceneBackgroundColor>
<SceneSkybox>null</SceneSkybox>
<EnvironmentResourceRef/>
<EnvironmentType>NONE</EnvironmentType>
<EnvironmentRotationX>0</EnvironmentRotationX>
<EnvironmentRotationY>0</EnvironmentRotationY>
<EnvironmentRotationZ>0</EnvironmentRotationZ>
<EnvironmentIntensity>1</EnvironmentIntensity>
<AgentProperties>
<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
Expand Down
7 changes: 6 additions & 1 deletion _alp/Agents/tabMobility/AOC.tabMobility.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,12 @@ import java.util.stream.Collectors;]]></Import>
<MakeDefaultViewArea>true</MakeDefaultViewArea>
<SceneGridColor/>
<SceneBackgroundColor>-4144960</SceneBackgroundColor>
<SceneSkybox>null</SceneSkybox>
<EnvironmentResourceRef/>
<EnvironmentType>NONE</EnvironmentType>
<EnvironmentRotationX>0</EnvironmentRotationX>
<EnvironmentRotationY>0</EnvironmentRotationY>
<EnvironmentRotationZ>0</EnvironmentRotationZ>
<EnvironmentIntensity>1</EnvironmentIntensity>
<AgentProperties>
<EnvironmentDefinesInitialLocation>true</EnvironmentDefinesInitialLocation>
<RotateAnimationTowardsMovement>true</RotateAnimationTowardsMovement>
Expand Down