Merge branch 'master' of https://github.com/aicis/fresco-stat into ma…

…ster

README.md

@@ -1,3 +1,5 @@
+[![Maven Central](https://img.shields.io/maven-central/v/dk.alexandra.fresco/stat.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22dk.alexandra.fresco%22%20AND%20a:%22stat%22) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://github.com/alexandrainst/fresco-stat/blob/master/README.md) 
+
 <h1>FRESCO-stat</h1>
 
 <p>
@@ -29,7 +31,7 @@ of the two. Or one party could know the model parameters and other parties the d
 model eg. in regression or machine learning.
 
 The library has four function libraries with the following functions:
-1. [Statistics](core/src/main/java/dk/alexandra/fresco/stat/Statistics.java)
+1. [Statistics](src/main/java/dk/alexandra/fresco/stat/Statistics.java)
     * Descriptive statistics
         * Sample mean
         * Sample standard deviation
@@ -52,7 +54,7 @@ The library has four function libraries with the following functions:
         * <i>k</i>-anonymization
         * Differentially private histograms
         * Differentially private linear regression
-1. [Sampling from various distributions](core/src/main/java/dk/alexandra/fresco/stat/Sampler.java)
+1. [Sampling from various distributions](src/main/java/dk/alexandra/fresco/stat/Sampler.java)
     * Bernoulli distribution
     * Categorical distribution
     * Exponential distribution
@@ -61,7 +63,7 @@ The library has four function libraries with the following functions:
     * Normal distribution
     * Rademacher distribution
     * Uniform distribution
-1. [Linear Algebra](core/src/main/java/dk/alexandra/fresco/stat/AdvancedLinearAlgebra.java) (see also the <i>fixed</i> library in FRESCO for basic linear algebra functions)
+1. [Linear Algebra](src/main/java/dk/alexandra/fresco/stat/AdvancedLinearAlgebra.java) (see also the <i>fixed</i> library in FRESCO for basic linear algebra functions)
     * Back- and forward substitution
     * Gram-Schmidt process
     * Inverse of triangular matrices
@@ -89,14 +91,14 @@ Build the project and the documentation using Maven:
 mvn clean install
 mvn javadoc:javadoc
 ```
-The javadoc can be found in the `core/target/apidocs` folder.
+The javadoc can be found in the `target/apidocs` folder.
 
 The library may be included in other projects by including it as a Maven dependency.
 ```
 <dependency>
-  <artifactId>stat-core</artifactId>
+  <artifactId>stat</artifactId>
   <groupId>dk.alexandra.fresco</groupId>
-  <version>1.0</version>
+  <version>0.2</version>
 </dependency>
 ```
 
@@ -152,4 +154,4 @@ Distributed under the MIT License. See [the licence](LICENSE) for more informati
 <!-- CONTACT -->
 ## Contact 
 The library is developed and maintained by the Security Lab at the <a href="https://alexandra.dk/about-the-alexandra-institute/">Alexandra Institute</a>. 
-If you have found a bug, have questions about the usage of the library, or you are missing functionality, feel free to contact us at <a href="[email protected]">[email protected]</a>. 
+If you have found a bug, have questions about the usage of the library, or you are missing functionality, feel free to contact us at <a href="[email protected]">[email protected]</a>. 

demo/pom.xml

@@ -3,16 +3,18 @@
   xmlns="http://maven.apache.org/POM/4.0.0"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <artifactId>stat-demo</artifactId>
-  <build>
-    <plugins>
+  <version>0.2</version>
+  <groupId>dk.alexandra.fresco</groupId>
 
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
+  <properties>
+    <fresco.version>1.3.1</fresco.version>
+    <maven.compiler.source>9</maven.compiler.source>
+    <maven.compiler.target>9</maven.compiler.target>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
 
+  <build>
+    <plugins>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <executions>
@@ -58,6 +60,27 @@
             <phase>package</phase>
           </execution>
 
+          <execution>
+            <configuration>
+              <archive>
+                <manifest>
+                  <mainClass>
+                    dk.alexandra.fresco.stat.SurvivalAnalysisBenchmarkDemo
+                  </mainClass>
+                </manifest>
+              </archive>
+              <descriptorRefs>
+                <descriptorRef>jar-with-dependencies</descriptorRef>
+              </descriptorRefs>
+              <finalName>survivalbench</finalName>
+            </configuration>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <id>survivalbench</id>
+            <phase>package</phase>
+          </execution>
+
           <execution>
             <configuration>
               <archive>
@@ -86,15 +109,15 @@
 
   <dependencies>
     <dependency>
-      <artifactId>spdz</artifactId>
       <groupId>dk.alexandra.fresco</groupId>
-      <version>1.3.1-SNAPSHOT</version>
+      <artifactId>stat</artifactId>
+      <version>0.2</version>
     </dependency>
 
     <dependency>
-      <artifactId>stat-core</artifactId>
+      <artifactId>spdz</artifactId>
       <groupId>dk.alexandra.fresco</groupId>
-      <version>0.2-SNAPSHOT</version>
+      <version>1.3.1</version>
     </dependency>
 
     <dependency>
@@ -106,13 +129,4 @@
   </dependencies>
   <modelVersion>4.0.0</modelVersion>
 
-  <packaging>jar</packaging>
-
-  <parent>
-    <artifactId>stat</artifactId>
-    <groupId>dk.alexandra.fresco</groupId>
-    <version>0.2-SNAPSHOT</version>
-  </parent>
-
-
 </project>

demo/src/main/java/dk/alexandra/fresco/stat/LinearRegressionDemo.java

@@ -34,7 +34,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 import org.apache.commons.csv.CSVFormat;

pom.xml

@@ -3,24 +3,17 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <artifactId>stat</artifactId>
   <groupId>dk.alexandra.fresco</groupId>
-  <version>0.2-SNAPSHOT</version>
+  <version>0.2</version>
 
   <modelVersion>4.0.0</modelVersion>
 
-  <packaging>pom</packaging>
-
   <properties>
     <fresco.version>1.3.1</fresco.version>
     <maven.compiler.source>9</maven.compiler.source>
     <maven.compiler.target>9</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
-  <modules>
-    <module>demo</module>
-    <module>core</module>
-  </modules>
-
   <name>FRESCO-stat</name>
   <description>
     Library for secure statistics and linear algebra on data divided among multiple parties without
@@ -45,40 +38,73 @@
     </developer>
   </developers>
 
+  <scm>
+    <connection>scm:git:git://github.com/aicis/fresco.git</connection>
+    <developerConnection>scm:git:ssh://github.com/aicis/fresco.git</developerConnection>
+    <url>https://github.com/aicis/fresco/tree/master/</url>
+  </scm>
+
   <organization>
     <name>The Alexandra Institute</name>
     <url>https://alexandra.dk</url>
   </organization>
 
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <groupId>org.apache.maven.plugins</groupId>
-        <version>2.22.2</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.2.0</version>
-        <configuration>
-          <quiet>true</quiet>
-          <nonavbar>true</nonavbar>
-          <notree>true</notree>
-          <nohelp>true</nohelp>
-          <noqualifier>all</noqualifier>
-        </configuration>
-        <executions>
-          <execution>
-            <id>attach-javadocs</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+  <dependencies>
+    <dependency>
+      <artifactId>core</artifactId>
+      <groupId>dk.alexandra.fresco</groupId>
+      <version>${fresco.version}</version>
+    </dependency>
+
+    <dependency>
+      <artifactId>mimc</artifactId>
+      <groupId>dk.alexandra.fresco</groupId>
+      <version>${fresco.version}</version>
+    </dependency>
+
+    <dependency>
+      <artifactId>fixed</artifactId>
+      <groupId>dk.alexandra.fresco</groupId>
+      <version>${fresco.version}</version>
+    </dependency>
+
+    <dependency>
+      <artifactId>junit</artifactId>
+      <groupId>junit</groupId>
+      <scope>test</scope>
+      <version>4.13.1</version>
+    </dependency>
+
+    <dependency>
+      <artifactId>mockito-core</artifactId>
+      <groupId>org.mockito</groupId>
+      <scope>test</scope>
+      <version>3.7.7</version>
+    </dependency>
+
+    <dependency>
+      <artifactId>commons-math3</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <scope>test</scope>
+      <version>3.6.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <artifactId>core</artifactId>
+      <groupId>dk.alexandra.fresco</groupId>
+      <scope>test</scope>
+      <type>test-jar</type>
+      <version>${fresco.version}</version>
+    </dependency>
+
+  </dependencies>
 
   <distributionManagement>
     <snapshotRepository>
@@ -95,7 +121,29 @@
     <profile>
       <id>release</id>
       <build>
+
         <plugins>
+          <!-- JAVADOC -->
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>3.2.0</version>
+            <configuration>
+              <quiet>true</quiet>
+              <nonavbar>true</nonavbar>
+              <notree>true</notree>
+              <nohelp>true</nohelp>
+            </configuration>
+            <executions>
+              <execution>
+                <id>attach-javadocs</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+
           <!-- SOURCE -->
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
@@ -110,6 +158,7 @@
               </execution>
             </executions>
           </plugin>
+
           <!-- GPG -->
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>