Merge pull request #35 from kleis-technology/fix/trace-depth-map

fix/trace depth map
kleis-technology · Oct 3, 2024 · 64bea04 · 64bea04
2 parents d21e407 + 6858b14
commit 64bea04
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 3 deletions.
diff --git a/core/src/main/kotlin/ch/kleis/lcaac/core/lang/evaluator/EvaluationTrace.kt b/core/src/main/kotlin/ch/kleis/lcaac/core/lang/evaluator/EvaluationTrace.kt
@@ -135,8 +135,7 @@ class EvaluationTrace<Q> {
 
     private fun updateDepthMap(port: MatrixColumnIndex<Q>, depth: Int) {
         depthMap[port] = depthMap[port]?.let {
-            if (it >= depth - 1) max(it, depth)
-            else it
+            max(it, depth)
         } ?: depth
     }
 }
diff --git a/core/src/test/kotlin/ch/kleis/lcaac/core/lang/evaluator/EvaluationTraceTest.kt b/core/src/test/kotlin/ch/kleis/lcaac/core/lang/evaluator/EvaluationTraceTest.kt
@@ -52,6 +52,57 @@ class EvaluationTraceTest {
     }
 
     @Test
+    fun trace_productOrder2() {
+        // given
+        val oneKg = QuantityValueFixture.oneKilogram
+        val product1 = ProductValueFixture.product("product1")
+        val product2 = ProductValueFixture.product("product2")
+        val product3 = ProductValueFixture.product("product3")
+        val product4 = ProductValueFixture.product("product4")
+
+        val p1 = ProcessValue(
+            name = "p1",
+            products = listOf(TechnoExchangeValue(oneKg, product1)),
+            inputs = listOf(
+                TechnoExchangeValue(oneKg, product2),
+                TechnoExchangeValue(oneKg, product4),
+            ),
+        )
+        val p2 = ProcessValue(
+            name = "p2",
+            products = listOf(TechnoExchangeValue(oneKg, product2)),
+            inputs = listOf(
+                TechnoExchangeValue(oneKg, product3),
+            ),
+        )
+        val p3 = ProcessValue(
+            name = "p3",
+            products = listOf(TechnoExchangeValue(oneKg, product3)),
+            inputs = listOf(
+                TechnoExchangeValue(oneKg, product4),
+            )
+        )
+        val trace = EvaluationTrace<BasicNumber>()
+        trace.addProcess(p1)
+        trace.commit()
+        trace.addProcess(p2)
+        trace.commit()
+        trace.addProcess(p3)
+        trace.commit()
+
+        // when
+        val actual = trace.getComparator()
+
+        // then
+        assert(actual.compare(product1, product2) < 0)
+        assert(actual.compare(product1, product3) < 0)
+        assert(actual.compare(product1, product4) < 0)
+        assert(actual.compare(product2, product3) < 0)
+        assert(actual.compare(product2, product4) < 0)
+        assert(actual.compare(product3, product4) < 0)
+    }
+
+    // Cannot satisfy both this test and the previous one
     fun trace_productOrder_withLongCycle() {
         // given
         val oneKg = QuantityValueFixture.oneKilogram

diff --git a/gradle.properties b/gradle.properties
@@ -2,4 +2,4 @@ javaVersion=17
 gradleVersion=7.6
 org.gradle.jvmargs=-Xmx4096m
 lcaacGroup=ch.kleis.lcaac
-lcaacVersion=1.7.5
+lcaacVersion=1.7.6