[smartcharging] Fix setpoint computation + add unit tests

Author: c-jimenez

src/chargepoint/smartcharging/ProfileDatabase.h

@@ -51,7 +51,7 @@ class ProfileDatabase
 
     /** @brief Stores a profile alongside its target connector */
     typedef std::pair<unsigned int, ocpp::types::ChargingProfile> ChargingProfileInfo;
-    /** @brief Allow sorting of profiles by stack level  and connector id*/
+    /** @brief Allow sorting of profiles by stack level and connector id*/
     struct ChargingProfileInfoLess
     {
         bool operator()(const ChargingProfileInfo& lhs, const ChargingProfileInfo& rhs) const

src/chargepoint/smartcharging/SmartChargingManager.cpp

@@ -105,15 +105,12 @@ bool SmartChargingManager::getSetpoint(unsigned int
             }
         }
 
-        // Compute connector setpoint if a transaction is active on the connector
+        // Compute connector setpoint
         connector_setpoint.clear();
-        if (connector->transaction_id != 0)
+        computeSetpoint(connector, connector_setpoint, unit, m_profile_db.txProfiles());
+        if (!connector_setpoint.isSet())
         {
-            computeSetpoint(connector, connector_setpoint, unit, m_profile_db.txProfiles());
-            if (!connector_setpoint.isSet())
-            {
-                computeSetpoint(connector, connector_setpoint, unit, m_profile_db.txDefaultProfiles());
-            }
+            computeSetpoint(connector, connector_setpoint, unit, m_profile_db.txDefaultProfiles());
         }
 
         // Connector setpoint cannot be greater than charge point setpoint
@@ -541,16 +538,8 @@ void SmartChargingManager::computeSetpoint(Connector*
                                            ocpp::types::ChargingRateUnitType                          unit,
                                            const ProfileDatabase::ChargingProfileList&                profiles_list)
 {
-    unsigned int level = 0;
     for (const auto& profile : profiles_list)
     {
-        // Check if the profile has been found
-        if (connector_setpoint.isSet() && (profile.second.stackLevel < level))
-        {
-            // Profile found
-            break;
-        }
-
         // Check connector
         if ((profile.first == connector->id) || (profile.first == 0))
         {
@@ -560,19 +549,8 @@ void SmartChargingManager::computeSetpoint(Connector*
             {
                 // Apply setpoint
                 fillSetpoint(connector_setpoint, unit, profile.second, profile.second.chargingSchedule.chargingSchedulePeriod[period]);
-            }
 
-            // Check connector type
-            if (profile.first == 0)
-            {
-                // Any connector profile, save stack level in case of a connector specific
-                // profile with the same stack level exists
-                level = profile.second.stackLevel;
-            }
-            else
-            {
-                // Connector specific profile, stop search since it has highest priority
-                // over any connector profile
+                // Highest applicable profile found
                 break;
             }
         }
@@ -598,7 +576,7 @@ bool SmartChargingManager::isProfileActive(Connector*                          c
 
         // Check schedule validity
         if ((start_of_schedule <= time_point) &&
-            (!profile.chargingSchedule.duration.isSet() || ((start_of_schedule + profile.chargingSchedule.duration) <= time_point)))
+            (!profile.chargingSchedule.duration.isSet() || ((start_of_schedule + profile.chargingSchedule.duration) >= time_point)))
         {
             // Look for the matching period
             const auto& schedule_periods = profile.chargingSchedule.chargingSchedulePeriod;

tests/chargepoint/smartcharging/CMakeLists.txt

@@ -30,3 +30,11 @@ add_test(
   NAME test_profile_database
   COMMAND test_profile_database
 )
+
+# Unit tests for smartcharging setpoint
+add_executable(test_smartcharging_setpoint test_smartcharging_setpoint.cpp)
+target_link_libraries(test_smartcharging_setpoint unit_tests_stubs doctest sqlite3 pthread dl )
+add_test(
+  NAME test_smartcharging_setpoint
+  COMMAND test_smartcharging_setpoint
+)