From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 7 Feb 2024 11:12:04 +0000 (+0100)
Subject: change the logic of clipping leases
X-Git-Url: http://git.onelab.eu/?p=plcapi.git;a=commitdiff_plain;h=1b1b5a911bb005644baabb87ecba60602228a070

change the logic of clipping leases

there was a mishap when clipping, that was returning adjacent leases
---

diff --git a/PLC/LeaseFilter.py b/PLC/LeaseFilter.py
index 4ed6c01..de340ea 100644
--- a/PLC/LeaseFilter.py
+++ b/PLC/LeaseFilter.py
@@ -64,10 +64,10 @@ class LeaseFilter(Filter):
     # basic SQL utilities
     @staticmethod
     def sql_time_intersect(f1, u1, f2, u2):
-        # either f2 is in [f1,u1], or u2 is in [f1,u1], or f2<=f1<=u1<=u2
+        # either f2 is in [f1,u1[, or u2 is in ]f1,u1], or f2<=f1<u1<=u2
         return (
-            f"(({f1} <= {f2}) AND ({f2} <= {u1})) "
-            f"OR (({f1} <= {u2}) AND ({u2} <= {u1})) "
+            f"(({f1} <= {f2}) AND ({f2} < {u1})) "
+            f"OR (({f1} < {u2}) AND ({u2} <= {u1})) "
             f"OR (({f2}<={f1}) AND ({u1}<={u2}))")
 
     @staticmethod