Merge pull request #140 from cryptimeleon/develop

math release of version 3.0.1

Author: feidens

.github/workflows/tagget_release.yaml

@@ -14,7 +14,7 @@ jobs:
         with:
           java-version: 1.8
       - name: Publish to the Maven Central Repository
-        run: ./gradlew :publish -Prelease
+        run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -Prelease
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}

build.gradle

@@ -2,6 +2,7 @@ plugins {
     id 'java-library'
     id 'maven-publish'
     id 'signing'
+    id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
 }
 
 group = 'org.cryptimeleon'
@@ -149,15 +150,13 @@ publishing {
             }
         }
     }
+}
+
+nexusPublishing {
     repositories {
-        maven {
-            credentials {
-                username = System.getenv("OSSRH_USERNAME")
-                password = System.getenv("OSSRH_TOKEN")
-            }
-            name = 'OSSRH'
-            def releasesRepoUrl = 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
-            url = version.endsWith('SNAPSHOT') ? '' : releasesRepoUrl
+        sonatype {
+            username = System.getenv("OSSRH_USERNAME")
+            password = System.getenv("OSSRH_TOKEN")
         }
     }
 }

src/main/java/org/cryptimeleon/math/structures/cartesian/Vector.java

@@ -329,7 +329,7 @@ public Vector<X> truncate(int newLength) {
     public Vector<X> concatenate(Vector<? extends X> secondPart) {
         ArrayList<X> result = new ArrayList<>(values.size() + secondPart.values.size());
         result.addAll(values);
-        result.add((X) secondPart.values);
+        result.addAll(secondPart.values);
 
         return instantiateWithSafeArray(result);
     }

src/main/java/org/cryptimeleon/math/structures/rings/cartesian/RingElementVector.java

@@ -1,6 +1,8 @@
 package org.cryptimeleon.math.structures.rings.cartesian;
 
 import org.cryptimeleon.math.expressions.exponent.ExponentConstantExpr;
+import org.cryptimeleon.math.hash.ByteAccumulator;
+import org.cryptimeleon.math.hash.UniqueByteRepresentable;
 import org.cryptimeleon.math.serialization.ListRepresentation;
 import org.cryptimeleon.math.serialization.Representable;
 import org.cryptimeleon.math.serialization.Representation;
@@ -17,7 +19,7 @@
 /**
  * A vector of ring elements supporting element-wise ring operations with other ring element vectors.
  */
-public class RingElementVector extends Vector<RingElement> implements Representable {
+public class RingElementVector extends Vector<RingElement> implements Representable, UniqueByteRepresentable {
 
     public RingElementVector(RingElement... values) {
         super(values);
@@ -68,7 +70,7 @@ public RingElementVector pow(long exponent) {
     }
 
     public RingElementVector pow(Vector<?> exponents) {
-        return zip(exponents, (g,x) ->
+        return zip(exponents, (g, x) ->
                         x instanceof Long ? g.pow((Long) x)
                                 : g.pow((BigInteger) x),
                 RingElementVector::new);
@@ -148,4 +150,12 @@ public ProductRingElement asElementInProductRing() {
     public ExponentExpressionVector asExponentExpr() {
         return map(v -> new ExponentConstantExpr(v.asInteger()), ExponentExpressionVector::new);
     }
+
+    @Override
+    public ByteAccumulator updateAccumulator(ByteAccumulator accumulator) {
+        for (RingElement e : this.values) {
+            accumulator.escapeAndSeparate(e.getUniqueByteRepresentation());
+        }
+        return accumulator;
+    }
 }

src/test/java/org/cryptimeleon/math/structures/VectorTests.java

@@ -0,0 +1,23 @@
+package org.cryptimeleon.math.structures;
+
+import org.cryptimeleon.math.structures.cartesian.Vector;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class VectorTests {
+
+    /**
+     * Test that concatenation yields the correct result.
+     */
+    @Test
+    void testConcatenation() {
+        Vector<Integer> firstVector = Vector.of(0, 1, 2, 3);
+        Vector<Integer> secondVector = Vector.of(4, 5, 6);
+        Vector<Integer> concatenation = firstVector.concatenate(secondVector);
+
+        assertEquals(concatenation.length(), firstVector.length() + secondVector.length());
+        for (int i = 0; i < concatenation.length(); i++)
+            assertEquals(concatenation.get(i), i);
+    }
+}