deterministic heuristic for dist alg

sybila · Mar 29, 2017 · 1733eeb · 1733eeb
1 parent 889423b
commit 1733eeb
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/main/java/com/github/sybila/DistComponents.kt b/src/main/java/com/github/sybila/DistComponents.kt
@@ -82,14 +82,21 @@ class DistAlgorithm(
                 var maxWeight: Double = 0.0
                 map.entries().forEach { (state, p) ->
                     val weight = p.weight()
-                    if (weight > maxWeight) {
+                    if (weight > maxWeight || (weight == maxWeight && state > max?.first ?: -1)) {
                         max = state to p
                         maxWeight = weight
                     }
                 }
                 max
             }
         }.fold<Future<Pair<Int, Params>?>, Pair<Int, Params>?>(null) { current, future ->
+            /*future.get()?.let { new ->
+                current?.assuming {
+                    val max = it.second.weight()
+                    val newMax = new.second.weight()
+                    max > newMax || (max == newMax && it.first < new.first)
+                } ?: new
+            } ?: current*/
             val new = future.get()
             current?.assuming { it.second.weight() > new?.second?.weight() ?: 0.0 } ?: new
         }!!