Skip to content

Refactor diesel to petroleum fuel #212

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 6 commits into from
Dec 18, 2025
Merged

Refactor diesel to petroleum fuel #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
38922ad
Find Replace
Luc-Sol Dec 17, 2025
b4854e1
Bugfix
Luc-Sol Dec 17, 2025
0adf6b4
rollback refactor in avgc
Luc-Sol Dec 17, 2025
c1dcef8
more rollback refactor in avgc
Luc-Sol Dec 17, 2025
780f8ae
Merge branch 'main' into Refactor_Diesel_to_Petroleum_Fuel
AteZenmo Dec 18, 2025
cd1bd2b
bugfixes and cars now run by default on gasoline instead of Diesel!
AteZenmo Dec 18, 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
2 changes: 1 addition & 1 deletion _alp/Agents/AVGC_data/Variables.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1120,7 +1120,7 @@ Gemiddelde COP is 4.]]></Description>
<Variable Class="Parameter">
<Id>1726584205687</Id>
<Name><![CDATA[p_ratioElectricTrucks]]></Name>
<Description><![CDATA[Ratio of how many trucks are electric vs diesel.
<Description><![CDATA[Ratio of how many trucks are electric vs petroleumFuel.
???
https://nos.nl/artikel/2483604-elektrische-vrachtwagens-blijven-achter-door-complexe-serie-aan-uitdagingen --> 'volgens cbs nog geen half procent.']]></Description>
<X>50</X>
Expand Down
340 changes: 170 additions & 170 deletions _alp/Agents/UI_company/Code/Functions.java
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _alp/Agents/UI_company/Code/Functions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@
<ReturnModificator>VOID</ReturnModificator>
<ReturnType>int</ReturnType>
<Id>1714471183392</Id>
<Name><![CDATA[f_setDieselVehicleSliders]]></Name>
<Name><![CDATA[f_setPetroleumFuelVehicleSliders]]></Name>
<X>-430</X>
<Y>630</Y>
<Label>
Expand Down
60 changes: 30 additions & 30 deletions _alp/Agents/UI_company/Levels/Level.level.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,7 @@ f_setElectricVehicleSliders(p_gridConnection, OL_EnergyAssetType.ELECTRIC_VAN, (

//Update the other two sliders aswell
sl_hydrogenVansCompany.setValue(v_nbHydrogenVans, false);
sl_dieselVansCompany.setValue(v_nbDieselVans, false);
sl_petroleumFuelVansCompany.setValue(v_nbPetroleumFuelVans, false);

//Set scenario to custom
f_setScenario(2);
Expand Down Expand Up @@ -997,7 +997,7 @@ f_setHydrogenVehicleSliders(p_gridConnection, OL_EnergyAssetType.HYDROGEN_VAN, (

//Update the other two sliders aswell
sl_electricVansCompany.setValue(v_nbEVVans, false);
sl_dieselVansCompany.setValue(v_nbDieselVans, false);
sl_petroleumFuelVansCompany.setValue(v_nbPetroleumFuelVans, false);

//Set scenario to custom
f_setScenario(2);
Expand Down Expand Up @@ -1069,7 +1069,7 @@ f_setSimulateYearScreen();</ActionCode>
<Control Type="Slider">
<EmbeddedIcon>false</EmbeddedIcon>
<Id>1713446839201</Id>
<Name><![CDATA[sl_dieselVansCompany]]></Name>
<Name><![CDATA[sl_petroleumFuelVansCompany]]></Name>
<X>62</X>
<Y>47</Y>
<Label>
Expand All @@ -1084,7 +1084,7 @@ f_setSimulateYearScreen();</ActionCode>
<EmbeddedIcon>false</EmbeddedIcon>
<Enabled>true</Enabled>
<ActionCode>//Slider function
f_setDieselVehicleSliders(p_gridConnection, OL_EnergyAssetType.DIESEL_VAN, (int)sl_dieselVansCompany.getValue());
f_setPetroleumFuelVehicleSliders(p_gridConnection, OL_EnergyAssetType.PETROLEUM_FUEL_VAN, (int)sl_petroleumFuelVansCompany.getValue());

//Update the other two sliders aswell
sl_electricVansCompany.setValue(v_nbEVVans, false);
Expand All @@ -1097,13 +1097,13 @@ f_setScenario(2);
f_setSimulateYearScreen();</ActionCode>
</BasicProperties>
<ExtendedProperties>
<DefaultValueCode>v_nbDieselVans</DefaultValueCode>
<DefaultValueCode>v_nbPetroleumFuelVans</DefaultValueCode>
<Orientation>HORIZONTAL</Orientation>
<MinValue>v_minDieselVanSlider</MinValue>
<MaxValue>v_maxDieselVanSlider</MaxValue>
<MinValue>v_minPetroleumFuelVanSlider</MinValue>
<MaxValue>v_maxPetroleumFuelVanSlider</MaxValue>
<Step>1</Step>
<LinkTo>false</LinkTo>
<Link>v_nbDieselVans</Link>
<Link>v_nbPetroleumFuelVans</Link>
</ExtendedProperties>
</Control>
<Text>
Expand Down Expand Up @@ -1133,7 +1133,7 @@ f_setSimulateYearScreen();</ActionCode>
</Text>
<Text>
<Id>1713446839205</Id>
<Name><![CDATA[t_numberOfDieselVansCompany]]></Name>
<Name><![CDATA[t_numberOfPetroleumFuelVansCompany]]></Name>
<X>35</X>
<Y>50</Y>
<Label>
Expand All @@ -1149,7 +1149,7 @@ f_setSimulateYearScreen();</ActionCode>
<Rotation>0.0</Rotation>
<Color>-16777216</Color>
<Text><![CDATA[0]]></Text>
<TextCode>sl_dieselVansCompany.getIntValue()</TextCode>
<TextCode>sl_petroleumFuelVansCompany.getIntValue()</TextCode>
<Font>
<Name><![CDATA[Dialog]]></Name>
<Size>14</Size>
Expand Down Expand Up @@ -1184,7 +1184,7 @@ f_setSimulateYearScreen();</ActionCode>
</Text>
<Text>
<Id>1713446857516</Id>
<Name><![CDATA[t_numberOfDieselTrucksCompany]]></Name>
<Name><![CDATA[t_numberOfPetroleumFuelTrucksCompany]]></Name>
<X>35</X>
<Y>145</Y>
<Label>
Expand All @@ -1200,7 +1200,7 @@ f_setSimulateYearScreen();</ActionCode>
<Rotation>0.0</Rotation>
<Color>-16777216</Color>
<Text><![CDATA[0]]></Text>
<TextCode>sl_dieselTrucksCompany.getIntValue()</TextCode>
<TextCode>sl_petroleumFuelTrucksCompany.getIntValue()</TextCode>
<Font>
<Name><![CDATA[Dialog]]></Name>
<Size>14</Size>
Expand Down Expand Up @@ -1356,7 +1356,7 @@ f_setHydrogenVehicleSliders(p_gridConnection, OL_EnergyAssetType.HYDROGEN_TRUCK,

//Update the other two sliders aswell
sl_electricTrucksCompany.setValue(v_nbEVTrucks, false);
sl_dieselTrucksCompany.setValue(v_nbDieselTrucks, false);
sl_petroleumFuelTrucksCompany.setValue(v_nbPetroleumFuelTrucks, false);

//Set scenario to custom
f_setScenario(2);
Expand Down Expand Up @@ -1422,7 +1422,7 @@ f_setElectricVehicleSliders(p_gridConnection, OL_EnergyAssetType.ELECTRIC_TRUCK,

//Update the other two sliders aswell
sl_hydrogenTrucksCompany.setValue(v_nbHydrogenTrucks, false);
sl_dieselTrucksCompany.setValue(v_nbDieselTrucks, false);
sl_petroleumFuelTrucksCompany.setValue(v_nbPetroleumFuelTrucks, false);

//Set scenario to custom
f_setScenario(2);
Expand All @@ -1443,7 +1443,7 @@ f_setSimulateYearScreen();</ActionCode>
<Control Type="Slider">
<EmbeddedIcon>false</EmbeddedIcon>
<Id>1713446857526</Id>
<Name><![CDATA[sl_dieselTrucksCompany]]></Name>
<Name><![CDATA[sl_petroleumFuelTrucksCompany]]></Name>
<X>62</X>
<Y>142</Y>
<Label>
Expand All @@ -1458,7 +1458,7 @@ f_setSimulateYearScreen();</ActionCode>
<EmbeddedIcon>false</EmbeddedIcon>
<Enabled>true</Enabled>
<ActionCode>//Slider function
f_setDieselVehicleSliders(p_gridConnection, OL_EnergyAssetType.DIESEL_TRUCK, (int)sl_dieselTrucksCompany.getValue());
f_setPetroleumFuelVehicleSliders(p_gridConnection, OL_EnergyAssetType.PETROLEUM_FUEL_TRUCK, (int)sl_petroleumFuelTrucksCompany.getValue());

//Update the other two sliders aswell
sl_electricTrucksCompany.setValue(v_nbEVTrucks, false);
Expand All @@ -1471,13 +1471,13 @@ f_setScenario(2);
f_setSimulateYearScreen();</ActionCode>
</BasicProperties>
<ExtendedProperties>
<DefaultValueCode>v_nbDieselTrucks</DefaultValueCode>
<DefaultValueCode>v_nbPetroleumFuelTrucks</DefaultValueCode>
<Orientation>HORIZONTAL</Orientation>
<MinValue>v_minDieselTruckSlider</MinValue>
<MaxValue>v_maxDieselTruckSlider</MaxValue>
<MinValue>v_minPetroleumFuelTruckSlider</MinValue>
<MaxValue>v_maxPetroleumFuelTruckSlider</MaxValue>
<Step>1</Step>
<LinkTo>false</LinkTo>
<Link>v_nbDieselTrucks</Link>
<Link>v_nbPetroleumFuelTrucks</Link>
</ExtendedProperties>
</Control>
<Control Type="Slider">
Expand All @@ -1502,7 +1502,7 @@ f_setElectricVehicleSliders(p_gridConnection, OL_EnergyAssetType.ELECTRIC_VEHICL

//Update the other two sliders aswell
sl_hydrogenCarsCompany.setValue(v_nbHydrogenCars, false);
sl_dieselCarsCompany.setValue(v_nbDieselCars, false);
sl_petroleumFuelCarsCompany.setValue(v_nbPetroleumFuelCars, false);

//Set scenario to custom
f_setScenario(2);
Expand Down Expand Up @@ -1678,7 +1678,7 @@ f_setHydrogenVehicleSliders(p_gridConnection, OL_EnergyAssetType.HYDROGEN_VEHICL

//Update the other two sliders aswell
sl_electricCarsCompany.setValue(v_nbEVCars, false);
sl_dieselCarsCompany.setValue(v_nbDieselCars, false);
sl_petroleumFuelCarsCompany.setValue(v_nbPetroleumFuelCars, false);

//Set scenario to custom
f_setScenario(2);
Expand Down Expand Up @@ -1750,7 +1750,7 @@ f_setSimulateYearScreen();</ActionCode>
<Control Type="Slider">
<EmbeddedIcon>false</EmbeddedIcon>
<Id>1713446065933</Id>
<Name><![CDATA[sl_dieselCarsCompany]]></Name>
<Name><![CDATA[sl_petroleumFuelCarsCompany]]></Name>
<X>62</X>
<Y>-54</Y>
<Label>
Expand All @@ -1765,7 +1765,7 @@ f_setSimulateYearScreen();</ActionCode>
<EmbeddedIcon>false</EmbeddedIcon>
<Enabled>true</Enabled>
<ActionCode>//Slider function
f_setDieselVehicleSliders(p_gridConnection, OL_EnergyAssetType.DIESEL_VEHICLE, (int)sl_dieselCarsCompany.getValue());
f_setPetroleumFuelVehicleSliders(p_gridConnection, OL_EnergyAssetType.PETROLEUM_FUEL_VEHICLE, (int)sl_petroleumFuelCarsCompany.getValue());

//Update the other two sliders aswell
sl_electricCarsCompany.setValue(v_nbEVCars, false);
Expand All @@ -1778,13 +1778,13 @@ f_setScenario(2);
f_setSimulateYearScreen();</ActionCode>
</BasicProperties>
<ExtendedProperties>
<DefaultValueCode>v_nbDieselCars</DefaultValueCode>
<DefaultValueCode>v_nbPetroleumFuelCars</DefaultValueCode>
<Orientation>HORIZONTAL</Orientation>
<MinValue>v_minDieselCarSlider</MinValue>
<MaxValue>v_maxDieselCarSlider</MaxValue>
<MinValue>v_minPetroleumFuelCarSlider</MinValue>
<MaxValue>v_maxPetroleumFuelCarSlider</MaxValue>
<Step>1</Step>
<LinkTo>false</LinkTo>
<Link>v_nbDieselCars</Link>
<Link>v_nbPetroleumFuelCars</Link>
</ExtendedProperties>
</Control>
<Text>
Expand Down Expand Up @@ -1814,7 +1814,7 @@ f_setSimulateYearScreen();</ActionCode>
</Text>
<Text>
<Id>1713446065937</Id>
<Name><![CDATA[t_numberOfDieselCarsCompany]]></Name>
<Name><![CDATA[t_numberOfPetroleumFuelCarsCompany]]></Name>
<X>35</X>
<Y>-50</Y>
<Label>
Expand All @@ -1830,7 +1830,7 @@ f_setSimulateYearScreen();</ActionCode>
<Rotation>0.0</Rotation>
<Color>-16777216</Color>
<Text><![CDATA[0]]></Text>
<TextCode>sl_dieselCarsCompany.getIntValue()</TextCode>
<TextCode>sl_petroleumFuelCarsCompany.getIntValue()</TextCode>
<Font>
<Name><![CDATA[Dialog]]></Name>
<Size>14</Size>
Expand Down
18 changes: 9 additions & 9 deletions _alp/Agents/UI_company/Variables.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@
</Variable>
<Variable Class="PlainVariable">
<Id>1714139299844</Id>
<Name><![CDATA[v_nbDieselCars]]></Name>
<Name><![CDATA[v_nbPetroleumFuelCars]]></Name>
<X>-1050</X>
<Y>750</Y>
<Label>
Expand Down Expand Up @@ -288,7 +288,7 @@
</Variable>
<Variable Class="PlainVariable">
<Id>1714139381294</Id>
<Name><![CDATA[v_nbDieselVans]]></Name>
<Name><![CDATA[v_nbPetroleumFuelVans]]></Name>
<X>-1050</X>
<Y>950</Y>
<Label>
Expand All @@ -310,7 +310,7 @@
</Variable>
<Variable Class="PlainVariable">
<Id>1714139385293</Id>
<Name><![CDATA[v_nbDieselTrucks]]></Name>
<Name><![CDATA[v_nbPetroleumFuelTrucks]]></Name>
<X>-1050</X>
<Y>1150</Y>
<Label>
Expand Down Expand Up @@ -442,7 +442,7 @@
</Variable>
<Variable Class="PlainVariable">
<Id>1714140007855</Id>
<Name><![CDATA[v_minDieselCarSlider]]></Name>
<Name><![CDATA[v_minPetroleumFuelCarSlider]]></Name>
<X>-1050</X>
<Y>630</Y>
<Label>
Expand Down Expand Up @@ -486,7 +486,7 @@
</Variable>
<Variable Class="PlainVariable">
<Id>1714140056511</Id>
<Name><![CDATA[v_maxDieselCarSlider]]></Name>
<Name><![CDATA[v_maxPetroleumFuelCarSlider]]></Name>
<X>-1050</X>
<Y>690</Y>
<Label>
Expand Down Expand Up @@ -574,7 +574,7 @@
</Variable>
<Variable Class="PlainVariable">
<Id>1714141906268</Id>
<Name><![CDATA[v_minDieselVanSlider]]></Name>
<Name><![CDATA[v_minPetroleumFuelVanSlider]]></Name>
<X>-1050</X>
<Y>830</Y>
<Label>
Expand Down Expand Up @@ -618,7 +618,7 @@
</Variable>
<Variable Class="PlainVariable">
<Id>1714141906272</Id>
<Name><![CDATA[v_maxDieselVanSlider]]></Name>
<Name><![CDATA[v_maxPetroleumFuelVanSlider]]></Name>
<X>-1050</X>
<Y>890</Y>
<Label>
Expand Down Expand Up @@ -706,7 +706,7 @@
</Variable>
<Variable Class="PlainVariable">
<Id>1714142030267</Id>
<Name><![CDATA[v_minDieselTruckSlider]]></Name>
<Name><![CDATA[v_minPetroleumFuelTruckSlider]]></Name>
<X>-1050</X>
<Y>1030</Y>
<Label>
Expand All @@ -728,7 +728,7 @@
</Variable>
<Variable Class="PlainVariable">
<Id>1714142030269</Id>
<Name><![CDATA[v_maxDieselTruckSlider]]></Name>
<Name><![CDATA[v_maxPetroleumFuelTruckSlider]]></Name>
<X>-1050</X>
<Y>1090</Y>
<Label>
Expand Down
8 changes: 4 additions & 4 deletions _alp/Agents/Zero_Interface/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2842,13 +2842,13 @@ ArrayList<GridConnection> f_updateJ_EAlistAfterDeserialisation(ArrayList<J_EA> E
{/*ALCODESTART::1753882411689*/
//Get all public and private parked cars
c_orderedVehiclesPrivateParking = new ArrayList<J_EAVehicle>();
List<J_EADieselVehicle> allPublicParkedCars = new ArrayList<J_EADieselVehicle>();
List<J_EAPetroleumFuelVehicle> allPublicParkedCars = new ArrayList<J_EAPetroleumFuelVehicle>();
for (GCHouse house : energyModel.Houses) {
if (house.p_eigenOprit) {
c_orderedVehiclesPrivateParking.addAll(house.c_vehicleAssets);
}
else{
allPublicParkedCars.addAll(house.c_dieselVehicles);
allPublicParkedCars.addAll(house.c_petroleumFuelVehicles);
}
}

Expand All @@ -2870,12 +2870,12 @@ ArrayList<GridConnection> f_updateJ_EAlistAfterDeserialisation(ArrayList<J_EA> E
GCPublicCharger charger = c_orderedPublicChargers.get(i);
int numberOfCars = numberOfCarsPerCharger.get(i);

List<J_EADieselVehicle> assignedCars = new ArrayList<>(allPublicParkedCars.subList(index, index + numberOfCars));
List<J_EAPetroleumFuelVehicle> assignedCars = new ArrayList<>(allPublicParkedCars.subList(index, index + numberOfCars));
c_mappingOfVehiclesPerCharger.put(charger.p_uid, assignedCars);

// Place vehicles depending on whether the charger is active
if (charger.v_isActive) {
for (J_EADieselVehicle car : assignedCars) {
for (J_EAPetroleumFuelVehicle car : assignedCars) {
J_ActivityTrackerTrips tripTracker = car.getTripTracker(); //Needed, as triptracker is removed when removeEnergyAsset is called.
car.removeEnergyAsset();
car.setTripTracker(tripTracker);//Re-set the triptracker again, for storing.
Expand Down
2 changes: 1 addition & 1 deletion _alp/Agents/Zero_Interface/Variables.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3501,7 +3501,7 @@ OL_FilterOptionsGC.MANUAL_SELECTION, "Handmatige selectie"
<Properties SaveInSnapshot="true" AccessType="public" StaticVariable="false">
<CollectionClass>LinkedHashMap</CollectionClass>
<ElementClass>String</ElementClass>
<ValueElementClass>List&lt;J_EADieselVehicle&gt;</ValueElementClass>
<ValueElementClass>List&lt;J_EAPetroleumFuelVehicle&gt;</ValueElementClass>
</Properties>
</Variable>
<Variable Class="CollectionVariable">
Expand Down
Loading