Merge pull request #443 from JohnLCaron/stats

minor tweaks on the stats class.
votingworks · Jan 6, 2024 · be1a34f · be1a34f
2 parents a2773c3 + 42f1901
commit be1a34f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/egklib/src/commonMain/kotlin/electionguard/core/GroupCommon.kt b/egklib/src/commonMain/kotlin/electionguard/core/GroupCommon.kt
@@ -202,7 +202,11 @@ interface GroupContext {
      */
     fun dLogG(p: ElementModP, maxResult: Int = - 1): Int?
 
-    fun showAndClearCountPowP() : String
+    fun showAndClearCountPowP(count :CountExp? = null) : String
+}
+
+class CountExp(var exp: Int, var acc: Int) {
+    constructor(): this(0,0)
 }
 
 interface Element {

diff --git a/egklib/src/commonMain/kotlin/electionguard/util/Stats.kt b/egklib/src/commonMain/kotlin/electionguard/util/Stats.kt
@@ -18,6 +18,13 @@ class Stats {
         }
     }
 
+    fun show(who: String) {
+        val stat = stats.get(who)
+        if (stat != null) println(stat.show()) else println("no stat named $who")
+    }
+
+    fun get(who: String) : Stat? = stats.get(who)
+
     fun show(len: Int = 3) {
         showLines(len).forEach { println(it) }
     }

diff --git a/egklib/src/jvmMain/kotlin/electionguard/cli/RunAccumulateTally.kt b/egklib/src/jvmMain/kotlin/electionguard/cli/RunAccumulateTally.kt
@@ -129,7 +129,7 @@ class RunAccumulateTally {
             val took = getSystemTimeInMillis() - starting
             val msecPerEncryption = if (countOk == 0) 0 else (took.toDouble() / countOk).roundToInt()
             println("AccumulateTally processed $countOk good ballots, $countBad bad ballots, took $took millisecs, $msecPerEncryption msecs per good ballot")
-            println("  ballots ids accumulated = ${tally.castBallotIds.joinToString(",")}")
+            // println("  ballots ids accumulated = ${tally.castBallotIds.joinToString(",")}")
         }
     }
 }
diff --git a/egklib/src/jvmMain/kotlin/electionguard/core/Group.kt b/egklib/src/jvmMain/kotlin/electionguard/core/Group.kt
@@ -266,10 +266,12 @@ class ProductionGroupContext(
 
     override fun dLogG(p: ElementModP, maxResult: Int): Int? = dlogger.dLog(p, maxResult)
 
-    // temp debug
-
-    override fun showAndClearCountPowP() : String {
+    override fun showAndClearCountPowP(count :CountExp?) : String {
         val result = "countPowP,AccPowP= ${countPow}, $countAccPowP total= ${countPow.get()+countAccPowP.get()}"
+        if (count != null) {
+            count.exp = countPow.get()
+            count.acc = countAccPowP.get()
+        }
         countPow.set(0)
         countAccPowP.set(0)
         return result