Final correction on TH computation

forsyde · Jun 28, 2024 · 541ea78 · 541ea78
1 parent 7404798
commit 541ea78
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/...heuristics/src/main/java/idesyde/metaheuristics/AperiodicAsynchronousDataflowMethods.java b/...heuristics/src/main/java/idesyde/metaheuristics/AperiodicAsynchronousDataflowMethods.java
@@ -142,7 +142,7 @@ default double[] recomputeMaximumCycles(
         // now add cycles created by the transmission of messages
         for (int i = 0; i < numJobs; i++) {
             var finalI = i;
-            maxCycles.put(i, Math.max(maxCycles.getOrDefault(i, 0.0), jobWeights[i] + IntStream.range(0, numJobs).mapToDouble(j -> edgeWeigths[finalI][j]).sum()));
+            maxCycles.put(i, Math.max(maxCycles.getOrDefault(i, 0.0), Math.max(jobWeights[i], IntStream.range(0, numJobs).mapToDouble(j -> edgeWeigths[finalI][j]).sum())));
         }
         // System.out.println("A maxCycles: " + maxCycles);
         var mappedInspector = new ConnectivityInspector<>(mappingGraph);

diff --git a/rust-bridge-minizinc/src/AperiodicAsynchronousDataflowToPartitionedTiledMulticore.mzn b/rust-bridge-minizinc/src/AperiodicAsynchronousDataflowToPartitionedTiledMulticore.mzn
@@ -178,7 +178,7 @@ constraint forall(p, pp in Processes where p != pp) (processMapping[p] = process
 constraint forall(p, pp in Processes where p != pp /\ connected[p, pp]) (invThroughput[p] = invThroughput[pp]);
 
 constraint forall(a in Processes) (
-  invThroughput[a] >= duration[a] + sum(b in Buffers where processesWriteBuffer[a, b] > 0) (durationBufferMessage[b])
+  invThroughput[a] >= max([duration[a], sum(b in Buffers where processesWriteBuffer[a, b] > 0) (durationBufferMessage[b])])
 );
 
 constraint forall(f, ff in Firings where processMapping[firingsActor[f]] = processMapping[firingsActor[ff]] /\ f != ff) (

diff --git a/rust-orchestration/src/exploration.rs b/rust-orchestration/src/exploration.rs
@@ -471,10 +471,10 @@ impl Iterator for MultiLevelCombinedExplorerIterator3 {
                             }
                         }
                         Err(std::sync::mpsc::RecvTimeoutError::Disconnected) => {
-                            // let optimal = self.levels_status[i]
-                            // .lock()
-                            // .map(|x| *x == ExplorationStatus::Optimal)
-                            // .unwrap_or(false);
+                            let optimal = self.levels_status[i]
+                            .lock()
+                            .map(|x| *x == ExplorationStatus::Optimal)
+                            .unwrap_or(false);
                             let all_optimal_finished = (0..self.levels_streams.len())
                                 .filter(|i| self.levels_is_exact[*i])
                                 .all(|i| {

diff --git a/scala-choco/src/main/scala/idesyde/choco/CanSolveSDFToTiledMultiCore.scala b/scala-choco/src/main/scala/idesyde/choco/CanSolveSDFToTiledMultiCore.scala
@@ -687,7 +687,7 @@ final class CanSolveSDFToTiledMultiCore
     val nJobs = jobs.size
 
     for (i <- 0 until nJobs) {
-      maxCycles(i) = Math.max(maxCycles(i), jobWeight(i) + edgeWeight(i).sum)
+      maxCycles(i) = Math.max(maxCycles(i), Math.max(jobWeight(i), edgeWeight(i).sum))
     }
 
     val mappingGraph = DefaultDirectedGraph[(String, Int), DefaultEdge](classOf[DefaultEdge])