diff --git a/CarSharingSystemSimplified.mo b/CarSharingSystemCaseStudy.mo
similarity index 88%
rename from CarSharingSystemSimplified.mo
rename to CarSharingSystemCaseStudy.mo
index 0e03b75c78638c284c1bbd5c7a83701e54d8d76f..8d00bf911a59af7605504f722136b025a9026833 100644
--- a/CarSharingSystemSimplified.mo
+++ b/CarSharingSystemCaseStudy.mo
@@ -1,20 +1,18 @@
-model CarSharingSystemSimplified
+model CarSharingSystemCaseStudy
+
// Parameters
parameter Integer numCars = 10 "Number of cars in the system";
- parameter Integer numUsers = 5 "Number of users in the system";
+ parameter Integer numUsers = 1 "Number of users in the system";
+ parameter Real userArrivalRate = 1.0 "User arrival rate (users per time unit)";
parameter Real returnRate = 0.5 "Car return rate";
parameter Real chargingTime = 1.0 "Time to fully charge a car";
parameter Real usageTime = 1.0 "Car usage time by a customer";
- parameter Real userPatience = 2.0 "Maximum waiting time for users";
+ parameter Real userPatience = 10.0 "Maximum waiting time for users";
// State variables for objectives
Real totalWaitingTime(start=0) "Total waiting time for users";
- Real carUtilization(start=0) "Car utilization over time";
- Real carsInUse(start=0) "Number of cars in use";
-
- // Discrete Variables for Intermediate Calculations
- discrete Real waitingTimeIncrement(start=0);
- discrete Real carUtilizationIncrement(start=0);
+ Real totalCarsRented(start=0) "Total number of cars rented";
+ discrete Integer usersLeaving(start=0);
// Discrete Place: Number of free places in the station
PNlib.Components.PD PSCii(nIn = 1, nOut = 1) annotation(
@@ -38,10 +36,10 @@ model CarSharingSystemSimplified
PNlib.Components.PD PSDi(nIn = 1, nOut = 2, startTokens = numUsers) annotation(
Placement(transformation(origin = {-270, 10}, extent = {{-10, -10}, {10, 10}})));
// Deterministic transition: User demand “not satisfied” at station
- PNlib.Components.TD TUNi(nIn = 1) annotation(
+ PNlib.Components.TD TUNi(nIn = 1, delay = userPatience) annotation(
Placement(transformation(origin = {-180, 10}, extent = {{-10, -10}, {10, 10}})));
// Stochastic Transition: User demand arrival at station
- PNlib.Components.TES TUDi(nOut = 1, distributionType = PNlib.Types.DistributionType.Exponential, h = 1/userPatience) annotation(
+ PNlib.Components.TES TUDi(nOut = 1, distributionType = PNlib.Types.DistributionType.Exponential, h = 1/userArrivalRate) annotation(
Placement(transformation(origin = {-314, 10}, extent = {{-10, -10}, {10, 10}})));
// Stochastic Transition: Car return to station Si by user. Then, the car is in a charging situation
PNlib.Components.TES TCCi(nIn = 2, nOut = 1, distributionType = PNlib.Types.DistributionType.Exponential, h = 1/chargingTime) annotation(
@@ -84,23 +82,15 @@ model CarSharingSystemSimplified
Placement(transformation(origin = {-356, 208}, extent = {{-10, -10}, {10, 10}})));
equation
- // Objective Equations
- // totalWaitingTime = numUsers * userPatience * (1 - returnRate); // Total waiting time is number of users multiplied by their patience
- // carUtilization = (numUsers * usageTime) / (numCars * (usageTime + chargingTime + (1 / returnRate))); // Car utilization is based on usage time
-
- // Objective Equations
-
- // Calculate waiting time when users leave without getting a car
- when change(PSDi.t) then
- waitingTimeIncrement = (pre(PSDi.t) - PSDi.t) * userPatience;
- totalWaitingTime = pre(totalWaitingTime) + waitingTimeIncrement;
+ // Update total waiting time when users leave
+ when change(PSDi.tokenFlow.outflow[2]) then
+ usersLeaving = PSDi.tokenFlow.outflow[2]; // Number of users leaving
+ totalWaitingTime = pre(totalWaitingTime) + usersLeaving * userPatience;
end when;
-
- // Calculate car utilization
- when change(PSRi.t) then
- carsInUse = numCars - PSRi.t;
- carUtilizationIncrement = carsInUse * usageTime / (numCars * (time + Modelica.Constants.eps));
- carUtilization = pre(carUtilization) + carUtilizationIncrement;
+
+ // Update total number of cars rented
+ when change(PSRi.tokenFlow.outflow[1]) then
+ totalCarsRented = PSRi.tokenFlow.outflow[1];
end when;
// Connections
@@ -153,7 +143,7 @@ equation
connect(TUSp.outPlaces[1], PCU.inTransition[2]) annotation(
Line(points = {{106, -6}, {2, -6}, {2, 0}}, thickness = 0.5));
annotation(
- uses(PNlib(version = "3.0.0")),
+ uses(PNlib(version = "3.0.0"), Modelica(version = "4.0.0")),
Diagram(graphics = {Text(origin = {-337, -14}, extent = {{3, 0}, {-3, 0}}, textString = "text"), Text(origin = {-304, 192}, extent = {{42, -20}, {-42, 0}}, textString = "Station subnet"), Rectangle(origin = {-245, 103}, lineColor = {0, 0, 255}, lineThickness = 0.5, extent = {{-103, 71}, {103, -71}}), Rectangle(origin = {-257, 5}, lineColor = {0, 255, 0}, lineThickness = 0.5, extent = {{-91, 23}, {91, -23}}), Text(origin = {-304, -20}, extent = {{42, -20}, {-42, 0}}, textString = "User demand subnet"), Rectangle(origin = {224, 30}, lineColor = {0, 170, 255}, lineThickness = 0.5, extent = {{-132, 72}, {132, -72}}), Text(origin = {121, 136}, extent = {{57, -48}, {-57, 0}}, textString = "User Demand (park) subnet"), Polygon(origin = {342, 55}, lineColor = {255, 85, 255}, lineThickness = 0.5, points = {{-154, 111}, {-154, 57}, {32, 57}, {32, -139}, {142, -139}, {142, 137}, {-154, 137}, {-154, 127}, {-154, 111}}), Text(origin = {273, 201}, extent = {{-81, 25}, {81, -25}}, textString = "Car Maintenance (Center) subnet"), Rectangle(origin = {293, -77}, lineColor = {85, 85, 0}, lineThickness = 0.5, extent = {{-145, 87}, {145, -87}}), Text(origin = {227, -176}, extent = {{-73, 20}, {73, -20}}, textString = "Car-Sharing Park (Center) subnet"), Text(extent = {{-16, 40}, {-16, 40}}, textString = "text"), Text(origin = {-38, 62}, extent = {{-26, 16}, {26, -16}}, textString = "Cars in use"), Text(origin = {-339, 67}, extent = {{-37, 35}, {37, -35}}, textString = "Charging of cars"), Text(origin = {-204, 63}, extent = {{-32, 7}, {32, -7}}, textString = "Cars are ready")}, coordinateSystem(extent = {{-380, 240}, {500, -200}})),
version = "");
-end CarSharingSystemSimplified;
+end CarSharingSystemCaseStudy;