From 4e38dee8cace3b418b3015ef240bbfa1bd7f101c Mon Sep 17 00:00:00 2001
From: JohnLCaron <jcaron1129@gmail.com>
Date: Wed, 10 Apr 2024 10:38:54 -0600
Subject: [PATCH] Add opCounts to EcGroup

---
 .../org/cryptobiotic/eg/core/GroupContext.kt  |  10 ++++++++++
 .../eg/core/ecgroup/EcElementModP.kt          |   2 ++
 .../eg/core/ecgroup/EcGroupContext.kt         |   7 ++++++-
 src/test/data/workflow/allAvailableEc.zip     | Bin 374068 -> 374068 bytes
 .../org/cryptobiotic/eg/core/GroupTest.kt     |  10 ----------
 .../eg/workflow/RunEncryptBallotTiming.kt     |   7 ++-----
 6 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/main/kotlin/org/cryptobiotic/eg/core/GroupContext.kt b/src/main/kotlin/org/cryptobiotic/eg/core/GroupContext.kt
index de85d9b..167bcc8 100644
--- a/src/main/kotlin/org/cryptobiotic/eg/core/GroupContext.kt
+++ b/src/main/kotlin/org/cryptobiotic/eg/core/GroupContext.kt
@@ -275,5 +275,15 @@ fun GroupContext.addQ(vararg elements: ElementModQ) = elements.asIterable().addQ
  */
 fun GroupContext.multP(vararg elements: ElementModP) = elements.asIterable().multP()
 
+fun GroupContext.showOpCountResults(where: String): String {
+    val opCounts = this.getAndClearOpCounts()
+    return buildString {
+        appendLine("$where:")
+        opCounts.toSortedMap().forEach { (key, value) ->
+            appendLine("   $key : $value")
+        }
+    }
+}
+
 
 
diff --git a/src/main/kotlin/org/cryptobiotic/eg/core/ecgroup/EcElementModP.kt b/src/main/kotlin/org/cryptobiotic/eg/core/ecgroup/EcElementModP.kt
index dae5483..635dad2 100644
--- a/src/main/kotlin/org/cryptobiotic/eg/core/ecgroup/EcElementModP.kt
+++ b/src/main/kotlin/org/cryptobiotic/eg/core/ecgroup/EcElementModP.kt
@@ -1,6 +1,7 @@
 package org.cryptobiotic.eg.core.ecgroup
 
 import org.cryptobiotic.eg.core.*
+import java.util.concurrent.atomic.AtomicInteger
 
 class EcElementModP(val group: EcGroupContext, val ec: VecElementP): ElementModP {
     override val context: GroupContext = group
@@ -36,6 +37,7 @@ class EcElementModP(val group: EcGroupContext, val ec: VecElementP): ElementModP
 
     override fun powP(exp: ElementModQ): ElementModP {
         require (exp is EcElementModQ)
+        group.opCounts.getOrPut("exp") { AtomicInteger(0) }.incrementAndGet()
         return EcElementModP(group, ec.exp(exp.element))
     }
 
diff --git a/src/main/kotlin/org/cryptobiotic/eg/core/ecgroup/EcGroupContext.kt b/src/main/kotlin/org/cryptobiotic/eg/core/ecgroup/EcGroupContext.kt
index 85783c0..34c362e 100644
--- a/src/main/kotlin/org/cryptobiotic/eg/core/ecgroup/EcGroupContext.kt
+++ b/src/main/kotlin/org/cryptobiotic/eg/core/ecgroup/EcGroupContext.kt
@@ -3,6 +3,7 @@ package org.cryptobiotic.eg.core.ecgroup
 
 import org.cryptobiotic.eg.core.*
 import java.math.BigInteger
+import java.util.concurrent.atomic.AtomicInteger
 
 class EcGroupContext(val name: String, useNative: Boolean = true): GroupContext {
     val vecGroup: VecGroup = VecGroups.getEcGroup(name, useNative)
@@ -52,8 +53,12 @@ class EcGroupContext(val name: String, useNative: Boolean = true): GroupContext
         return EcElementModP(this, vecGroup.g.exp(exp.element))
     }
 
+    var opCounts: HashMap<String, AtomicInteger> = HashMap()
     override fun getAndClearOpCounts(): Map<String, Int> {
-        return emptyMap()
+        val result = HashMap<String, Int>()
+        opCounts.forEach { (key, value) -> result[key] = value.get() }
+        opCounts = HashMap()
+        return result.toSortedMap()
     }
 
     override fun isCompatible(ctx: GroupContext): Boolean {
diff --git a/src/test/data/workflow/allAvailableEc.zip b/src/test/data/workflow/allAvailableEc.zip
index e3b184c0348e626bc866c9f53195a189f1a113d3..30b3a0902cbbed4540d3c65d169d20cc74736909 100644
GIT binary patch
delta 2467
zcmYjRZBUd|6z1K%2Q-yYLl`g>@?*jr-6d>BQDHYR&D4d=kVzD0O2=>%6|>RNw!q5#
zLUb>(f_x(&AIoC5G;_=*bxgFz#K>eA43$i+940^O-h1x*zWjQ4&Uv2aoO|EPHg|_M
zcZc?O&9;(|fIfZt1Z22<{g-Q&47Y#1HX1nQ6$T~<Xb(*0Ku`XmIsEH_I))449%FI(
z_m5d&5Sow&f&Mv(!QqCsC@or&^dN40X2bV})*nL8OCmb7WiJHzU;HA>H0E3gHI3J9
zx`mc;ZO>4VElrC&5X4GGYN<vji+5_r3;~;(rcEBA%h}PjT9fRFy;<Wf?X)qU9j({a
zNG1-*R-M;eavo<tnwHB!mTFn%0mr3UCViA>iPTqhvaU2sgvq9Fu*{W8zOa+7_Cg@L
z>am=aB{}Nm5z8ojMJIEevowf#OuJ#}HV03zTHi5J*p(=2ls>`1ro>sl(|Zo~N~-k*
zvsb^?dQ$XQ<{oR8j1%|93hJ%T>oXnfzf;x$x`l7>n>9y|bF%Qq);L}1Wch=Lp>(jD
zW63fZo-~Vir9~cS!g5j}M@bfzO>82Z%_<}n;ytl@rKBKO{IT6fGQ>+`51UA)bgXP4
zalAllT8KknQY*2sVHe0+Aw%}<MY7psYknddC5yVnl_M^ZO?uBxw^Z=EzVtH+7?0X1
zdaUCL`AQer*bi-Fp~>F5N_I;o<HE0zZ3d&Os(9S5?PRtoPw5~#OcvHj-ZWX!b+S%p
zc9z&hVs&Pt1FHG6ZMs2LiW1|qDvcg{&`mxxS?z6=DHn>lL)Pd$J8Qj5G7Uzb*6{V*
zf012!$wpnZe9WwW)D6kI?781N{ZNm(OPQYXFPUSQS?dFmqcc0(^~k(+J4<*%Ue|jz
z_RZ5?XFD<qT(Tu2D>dj9Iob+Fq>Z-M^X)nbyksWL3<TrscJ?R;wwh7?zA#Z&+S$;4
z(CfRO=?__Y&&E~-L$4PyVjv`&y|O`&Bw5d3m@eK_aR@ls=4T;NR2gSWWLuV}heDKO
z%fi4R#Eas=#@fQ*y}<^1e=J-N5mw&&+$={VL$Lg}k(ShD5FaK)-p!CHMZvisepIO|
z7ZL^1T$m=XH5Xh0qxV3%!0mfrsla;*=jUOa<zap3Uc@a5JNH6*-wgL>DcN(fBbQLE
z1cuP1`(TF1sM&|wU=J*nn!C3uhIy%PAJ^>kpyo2~3GHNxSj16kk1f99Pr|(6`KWz2
zA9p#caNK_M?B*yv<IZiI6hJ!)dH%ox^rRG^=4*wKUgX(c%(|iY>;uT_52&nw)u)eZ
zm^Ho-v(^`)w@u-+BIKnC0}mo!p|C|^OtH!gkGTKKpEUCz-><0{GavGvIDcA+(k$%p
zZpon+^SS0)34W{5rMTOtr7%foPnF`ggff^cxT6eS7WhFK_8&IEbM#^vjFgv>dnW7i
zWNJIa0|%AEL?N764oL#N3h$KTBS@%#B<cB`97vl=8|%2Ip#nW!yeB-9DiOCUY_CMG
zy$bQ;DwVO=(sm*iGybl^jOat?-K6jWM>#KRif_sS8dbyRO{<1jS=&*3{q4ncUOBJr
zu7-)S)*79)Rb_Van%F0z2IpqfVD<@)QX3Ny@-!X&<7<_FzNer;Wx9Dy_`j@0U%$hc
zv*<ALMvgM)$@y~UI6TLQI`k~4Lrt~9$93qPTaWb;j?#O!a$csIH?RS{uQs5jpaDI%
z6_0O3p4+Ir3G-&WW|wn4KDGYT)FJC_xXK&6Cf48P1E;_iAHJiQCPa@y{ubgzKhBS1
ScPi{q7~72XPZYK_L+bx*aEB5A

delta 2467
zcmYjRYfzL`80OnOFK8;GhA?0%<YmGf-6d>BQDHYR&D4d=kVzD0O2>2*6|?ac1y<e>
z-Gi(kcLe0JEOJUS$81u^L~BfpOoqWw$<)eW@>=Jd_k7>SuZQP-pXYhsbH2kib_F+f
z1^0E$w2~mdUcGwxHEr_tU8-4{Hu=_RBY|U1zJHv6HvdEp^wb}k!?!k|eW)NAqbyF}
zfl<p0LgRA4-#05hFx1c%q(n-R8o-Uut^eN8`hw^MNkoS>?}Gr}%S|DsG3#QmX}o?b
zLueV-b`KWW(zL)00jy}amTZKwSf_T}5U|N9+QdP+oE=-EHOQXWo7L~u&KUFAv081l
zWa5Bq<ps?p=W+I<X}J<$sgz|Na6+nO(kJnjaD7!L>rAnPnQZEM%WSFS3p?p55BRfd
zZp%4YlA~@NwT#eLbTZd@OP!d<w40VLbMQE;^*tknU5&6t=o1`lQjGOGz2{)BC0k!I
zd$nt<r$mpX?X`BwIB{<*uh#maKGVVeJ8kW!TlfaQS+n#wCkuUIjnS1(mOFqLN(Z|&
znk<pw2{VXCTI7MoEhS}glw={9#3sVojC@ii-V?iDO!5N7A3MBcxp-;pQ3FYnjup)$
zh8Jj6GjRw^XdyN><RV!kWXQg~L^hjj^-pAjWD&Qya@b|EQSaI5mNI_Vmw!e9<59ar
zkF{SVU+E$n`=OQ0H`zPa$R5dLT<CSO&0ut81&{l+jm$LVN$q5($wE5F+a@cxLDuTb
z&f+^sw9ag_UnPIG4L8XOQDS^nxzS?}yU52TtG=T$<w8++$!fi4XD#<gn!)I^D!yLE
zUu3slvQbwxA2Z`0bwlzlyC3vSKisYEQl=;UOJ*5n*7A^K>CDb{KQ?dO&f=buH}#&4
zee<lx*^Z6?mu$(%at(S!j<kXiX`^kme7g<;ub4^G{lPf9ojneKt!9+3H;mVnb~d;V
z^!V;)`$D?jv$2(d(Bp*+>ko-$uVeruNY*_NriwRJ7z9qX`FRKzRmRyO*_P$0!4M(Y
zk`QnR@q$>evDOgyV4%T191S;ugq8QUo8_=X2$cUe(vrLcVnc+;vl-H)C@>quk1BO#
zL%cwm4O0ZRWP?j!<X%V>xMMFY7I<Ib+#Ia49IOxChqy&y$395y-L&b8q|8~F;fttN
z1cT_}{V+{rRP9G?pc@uT&Ar=YLp;>GpKErxQFDd&gmxlDEZ``$#}{7pC1BprT-3gw
zi@TgtIOYI)_HdM*G3Pf-@T2YdJimV)dXn-`^R>co5AsY8X5CbL=0W7O2UV8esxv1v
z%o>}IS?luA+p2I%0rFyn{)dn+Q`oF9s!(NyhCTS@Pnvd!@7GX>nU8o+oIj;VY36r(
zwq(&uxm<I-2*1_HV%+WXVwfPbr;G7hLJ3S1+))Cr3jC-9`;Qvn1$wCjhRaLIKAXNh
zk=hRPzyYN&UI?d`LV`e#!n>vT2;#~hL3(~C2U8}~`Wo)3D??8w?+MR@a>N}9+se^v
zuR#2?LS-zpw4RK{jK3=|Bl0kMH!8fyQO--B<efB+MpW^6Qz{`^)^--&cy}S4Q_5?5
zDq*~=wM3?GRhb>UCiV%d!nw<<F#9A&sf`K?dX|d*vDL~y*PU0VGBbEh_`j@1U!NnG
zv)~BwdX6&Z>4j3~7(B<Y8uZMoK~1H?CpGAuU5oW1j?#Osd`_C0*S`+Euh*d_uMRzT
z6pyV(o?WlJadW1<VV85=UbX(@<U#9fxXN3+Cf48P1*gDfFTSIw21K_){uW|IKgNe+
ScPVUF7~P2V&lI*cLh}DQdBA=E

diff --git a/src/test/kotlin/org/cryptobiotic/eg/core/GroupTest.kt b/src/test/kotlin/org/cryptobiotic/eg/core/GroupTest.kt
index 50a54e5..4441e6f 100644
--- a/src/test/kotlin/org/cryptobiotic/eg/core/GroupTest.kt
+++ b/src/test/kotlin/org/cryptobiotic/eg/core/GroupTest.kt
@@ -336,14 +336,4 @@ class GroupTest {
             assertEquals(expected, prodpow)
         }
     }
-}
-
-fun GroupContext.showOpCountResults(where: String): String {
-    val opCounts = this.getAndClearOpCounts()
-    return buildString {
-        appendLine("$where:")
-        opCounts.toSortedMap().forEach { (key, value) ->
-            appendLine("   $key : $value")
-        }
-    }
 }
\ No newline at end of file
diff --git a/src/test/kotlin/org/cryptobiotic/eg/workflow/RunEncryptBallotTiming.kt b/src/test/kotlin/org/cryptobiotic/eg/workflow/RunEncryptBallotTiming.kt
index fbaed18..6c07e98 100644
--- a/src/test/kotlin/org/cryptobiotic/eg/workflow/RunEncryptBallotTiming.kt
+++ b/src/test/kotlin/org/cryptobiotic/eg/workflow/RunEncryptBallotTiming.kt
@@ -73,17 +73,14 @@ class RunEncryptBallotTiming {
                 val encryptedBallot = encryptor.encrypt(ballot, ByteArray(0), ErrorMessages("testEncryption"))
                 requireNotNull(encryptedBallot)
             }
-            val opCounts = group.getAndClearOpCounts()
+            group.getAndClearOpCounts()
 
             val nencryptions = ncontests + ncontests * nselections
             println("Encryption ${stopwatch.tookPer(nballots, "ballots")}")
             println("   ${stopwatch.tookPer(nencryptions, "encryptions")}")
             println()
             if (showOperations) {
-                println("operations:")
-                println(buildString {
-                    opCounts.forEach { key, value -> println("  $key = $value") }
-                })
+                println(group.showOpCountResults("operations"))
                 println("expect: ${6 * nencryptions * nballots + 2 * nballots}")
             }
         }