starts to add annual adjustments

Etive-Mor · Mar 27, 2024 · decdfd8 · decdfd8
1 parent 7cc85f0
commit decdfd8
Show file tree

Hide file tree

Showing 8 changed files with 414 additions and 25 deletions.
diff --git a/EtiveMor.OpenImoCiiCalculator/EtiveMor.OpenImoCiiCalculator.Core.Tests/CalculatorTests.cs b/EtiveMor.OpenImoCiiCalculator/EtiveMor.OpenImoCiiCalculator.Core.Tests/CalculatorTests.cs
@@ -16,12 +16,13 @@ public void TestCalculator()
             var _calc = new Calculator();
 
             var result = _calc.CalculateAttainedCiiRating(
-                ShipType.BulkCarrier, 
-                1000, 
-                1000, 
-                1000, 
-                TypeOfFuel.HEAVYFUELOIL, 
-                1000);
+                ShipType.RoRoPassengerShip, 
+                grossTonnage: 25000, 
+                deadweightTonnage: 0, 
+                distanceTravelled: 150000, 
+                TypeOfFuel.DIESEL_OR_GASOIL,
+                fuelConsumption: 1.9e+10
+                );
 
             Assert.AreNotEqual(ImoCiiRating.ERR, result);
         }

diff --git a/EtiveMor.OpenImoCiiCalculator/EtiveMor.OpenImoCiiCalculator.Core.Tests/ShipCapacityTests.cs b/EtiveMor.OpenImoCiiCalculator/EtiveMor.OpenImoCiiCalculator.Core.Tests/ShipCapacityTests.cs
@@ -86,7 +86,8 @@ public void TestValidateTonnageParamsSet_ArgumentOutOfRangeException(ShipType sh
         [DataRow(ShipType.RefrigeratedCargoCarrier, 250000, 0, 250000)]
         [DataRow(ShipType.CombinationCarrier, 250000, 0, 250000)]
         [DataRow(ShipType.LngCarrier, 250000, 0, 250000)]
-        [DataRow(ShipType.RoRoCargoShip, 250000, 0, 250000)]
+        [DataRow(ShipType.RoRoCargoShip, 0, 250000, 250000)]
+        [DataRow(ShipType.RoRoPassengerShip_HighSpeedSOLAS, 0, 250000, 250000)]
         [DataRow(ShipType.RoRoCargoShipVehicleCarrier, 0, 100000, 100000)]
         [DataRow(ShipType.RoRoPassengerShip, 0, 100000, 100000)]
         [DataRow(ShipType.RoRoCruisePassengerShip, 0, 100000, 100000)]

diff --git a/EtiveMor.OpenImoCiiCalculator/EtiveMor.OpenImoCiiCalculator.Core/Calculator.cs b/EtiveMor.OpenImoCiiCalculator/EtiveMor.OpenImoCiiCalculator.Core/Calculator.cs
@@ -18,16 +18,27 @@ public Calculator()
             _carbonIntensityIndicatorService = new CarbonIntensityIndicatorCalculatorService();
         }
 
-
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="shipType"></param>
+        /// <param name="grossTonnage">in long-tons</param>
+        /// <param name="deadweightTonnage">in long-tons</param>
+        /// <param name="distanceTravelled">distance travelled in nautical miles</param>
+        /// <param name="fuelType"></param>
+        /// <param name="fuelConsumption">quantity of fuel consumed in grams</param>
+        /// <returns></returns>
         public ImoCiiRating CalculateAttainedCiiRating(ShipType shipType, double grossTonnage, double deadweightTonnage, double distanceTravelled, TypeOfFuel fuelType, double fuelConsumption)
         {
             var shipCo2Emissions = _shipMassOfCo2EmissionsService.GetMassOfCo2Emissions(fuelType, fuelConsumption);
-            var shipCapacity = _shipCapacityService.GetShipCapacity(shipType, grossTonnage, deadweightTonnage);
+            var shipCapacity = _shipCapacityService.GetShipCapacity(shipType, deadweightTonnage, grossTonnage);
             var transportWork = _shipTransportWorkService.GetShipTransportWork(shipCapacity, distanceTravelled);
             var attainedCii = _carbonIntensityIndicatorService.GetAttainedCarbonIntensity(shipCo2Emissions, transportWork);
+            var requiredCii = _carbonIntensityIndicatorService.GetRequiredCarbonIntensity(shipType, shipCapacity, 2019);
 
+            var attainedRequiredRatio = attainedCii / requiredCii;
 
-
+            
 
             return ImoCiiRating.ERR;
         }

diff --git a/EtiveMor.OpenImoCiiCalculator/EtiveMor.OpenImoCiiCalculator.Core/Models/Enums/ShipType.cs b/EtiveMor.OpenImoCiiCalculator/EtiveMor.OpenImoCiiCalculator.Core/Models/Enums/ShipType.cs
@@ -77,6 +77,12 @@ public enum ShipType
         /// </summary>
         /// <seealso cref="RoRoCruisePassengerShip"/>
         RoRoPassengerShip = 110,
+
+        /// <summary>
+        /// A type of high-speed ship designed to conform to SOLAS Chapter X standards 
+        /// </summary>
+        /// <seealso cref="RoRoCruisePassengerShip"/>
+        RoRoPassengerShip_HighSpeedSOLAS = 111,
 
         /// <summary>
         /// A type of ship designed primarily for passenger accommodation and leisure 

diff --git a/...EtiveMor.OpenImoCiiCalculator.Core/Services/ICarbonIntensityIndicatorCalculatorService.cs b/...EtiveMor.OpenImoCiiCalculator.Core/Services/ICarbonIntensityIndicatorCalculatorService.cs
@@ -1,8 +1,11 @@
-namespace EtiveMor.OpenImoCiiCalculator.Core.Services
+using EtiveMor.OpenImoCiiCalculator.Core.Models.Enums;
+
+namespace EtiveMor.OpenImoCiiCalculator.Core.Services
 {
     public interface ICarbonIntensityIndicatorCalculatorService
     {
         double GetAttainedCarbonIntensity(double massOfCo2Emissions, double transportWork);
-        void GetReferenceCarbonIntensity();
+        double GetRequiredCarbonIntensity(ShipType shipType, double capacity, int year);
+        Dictionary<int, double> GetRequiredCarbonIntensity(ShipType shipType, double capacity);
     }
 }