FIx Duplicate Manifest.

- Updated libraries
- Organized Examples

.gitignore

@@ -25,6 +25,4 @@ n2s3.iml
 .cache-main
 .cache-tests
 .classpath
-20NCropped \[1\] 15-04-2020 16:15:33/
 
-40N \[1\] 06-04-2020 21:24:40/

build.sbt

 import com.typesafe.sbt.SbtMultiJvm
-import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.{MultiJvm, scalatestOptions}
+import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm
 
 lazy val commonSettings = Seq(
-  version          := "1.1",
+  version          := "1.1.1",
   organization     := "fr.univ-lille.cristal",
   scalaVersion     := "2.11.6",
-  scalacOptions    := Seq("-unchecked", "-deprecation", "-encoding", "utf8", "-language:postfixOps", "-Xmax-classfile-name","78"),
+  scalacOptions    := Seq("-unchecked", "-deprecation", "-encoding", "utf8", "-language:postfixOps"),
 
  /********************************************************************************************************************
   * Dependecy information
@@ -50,19 +50,19 @@ lazy val commonSettings = Seq(
 )
 
 lazy val root = (project in file(".")).
-  aggregate(n2s3, n2s3_cluster, examples, daemon)
+  aggregate(n2s3, examples, daemon) //n2s3_cluster
 
 lazy val n2s3 = (project in file("n2s3")).
   settings(commonSettings: _*)
 
-lazy val n2s3_cluster = (project in file("n2s3_cluster")).
-  settings(commonSettings: _*).
-  dependsOn(n2s3)
+//lazy val n2s3_cluster = (project in file("n2s3_cluster")).
+//  settings(commonSettings: _*).
+//  dependsOn(n2s3)
 
 lazy val examples = (project in file("n2s3_examples")).
   settings(commonSettings: _*).
-  dependsOn(n2s3, n2s3_cluster)
-
+  dependsOn(n2s3)
+//dependsOn(n2s3, n2s3_cluster)
 lazy val daemon = (project in file("n2s3_daemon")).
   settings(commonSettings: _*).
   dependsOn(n2s3)
@@ -70,5 +70,9 @@ lazy val daemon = (project in file("n2s3_daemon")).
 lazy val integration_tests = (project in file("n2s3_integration_tests")).
   settings(SbtMultiJvm.multiJvmSettings: _*).
   settings(commonSettings: _*).
-  configs(MultiJvm).
-  dependsOn(n2s3, n2s3_cluster)
+  settings(
+    parallelExecution in Test := false
+  )
+  .configs(MultiJvm).
+  dependsOn(n2s3)
+

n2s3/build.sbt

@@ -17,7 +17,7 @@ test in assembly := {}
 libraryDependencies += "org.mongodb.scala" %% "mongo-scala-driver" % "2.6.0"
 
 libraryDependencies ++= {
-  val scalaXmlV = "1.0.2"
+  val scalaXmlV = "1.0.1"
   val akkaV = "2.3.7"
   val scalatestV = "2.2.1"
   Seq(
@@ -28,8 +28,15 @@ libraryDependencies ++= {
     "com.typesafe.akka" %% "akka-cluster"    % akkaV,
     "org.scalatest"     %% "scalatest"       % scalatestV % "test",
     "com.squants"  %% "squants"  % "0.5.3",
-    "com.storm-enroute" %% "scalameter" % "0.7",
-    "org.knowm.xchart" % "xchart" % "3.3.1" exclude("de.erichseifert.vectorgraphics2d", "VectorGraphics2D"),
+    "com.storm-enroute" %% "scalameter" % "0.19" % Test,
+    "com.fasterxml.jackson.core" % "jackson-databind" % "2.11.0",
+    "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.11.0",
+    "org.knowm.xchart" % "xchart" % "3.6.3" exclude("de.erichseifert.vectorgraphics2d", "VectorGraphics2D"),
    "net.sf" %% "jaer" % "1.0" from "https://sourcesup.renater.fr/frs/download.php/file/5047/jaer.jar"
   )
 }
+
+assemblyMergeStrategy in assembly := {
+case PathList("META-INF", xs @ _*) => MergeStrategy.discard
+case PathList("module-info.class") => MergeStrategy.discard
+case x => val oldStrategy = (assemblyMergeStrategy in assembly).value; oldStrategy(x) }

n2s3/src/main/java/fr/univ_lille/cristal/emeraude/n2s3/Graph.java

-package fr.univ_lille.cristal.emeraude.n2s3;
-
-import org.jfree.chart.ChartFactory;
-import org.jfree.chart.ChartPanel;
-import org.jfree.chart.JFreeChart;
-import org.jfree.chart.axis.NumberAxis;
-import org.jfree.chart.plot.PlotOrientation;
-import org.jfree.chart.plot.XYPlot;
-import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
-import org.jfree.data.xy.XYDataset;
-import org.jfree.data.xy.XYSeries;
-import org.jfree.data.xy.XYSeriesCollection;
-import org.jfree.ui.ApplicationFrame;
-
-import java.awt.*;
-
-public class Graph extends ApplicationFrame {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1352234752863184258L;
-
-	// chart data
-	private XYSeriesCollection _dataset;
-	private XYSeries firstSerie, secondSerie;
-
-	// abscissa of the next point
-	private int time;
-	private final String time_name = "time";
-
-	/**
-	 * Main constructor
-	 *
-	 * @param title
-	 *            title of the frame
-	 */
-	public Graph(String title, String first_title, String second_title) {
-		super(title);
-		this.time = 1;
-		this.firstSerie = new XYSeries(first_title);
-		this.secondSerie = new XYSeries(second_title);
-		this._dataset = new XYSeriesCollection();
-		this._dataset.addSeries(firstSerie);
-		this._dataset.addSeries(secondSerie);
-		final JFreeChart chart = createChart(_dataset);
-		final ChartPanel chartPanel = new ChartPanel(chart);
-		chartPanel.setPreferredSize(new java.awt.Dimension(500, 270));
-		setContentPane(chartPanel);
-		this.setVisible(true);
-	}
-
-	/**
-	 * Creation of the chart
-	 *
-	 * @param dataset
-	 *            data to display on the graph
-	 * @return the chart initialized
-	 */
-	private JFreeChart createChart(final XYDataset dataset) {
-
-		// create the chart...
-		final JFreeChart chart = ChartFactory.createXYLineChart(
-				this.getTitle(), // chart title
-				this.time_name, // x axis label
-				"Entity number", // y axis label
-				dataset, // data
-				PlotOrientation.VERTICAL, true, // include legend
-				true, // tooltips
-				false // urls
-				);
-
-		// NOW DO SOME OPTIONAL CUSTOMISATION OF THE CHART...
-		chart.setBackgroundPaint(Color.white);
-
-		// get a reference to the plot for further customisation...
-		final XYPlot plot = chart.getXYPlot();
-		plot.setBackgroundPaint(Color.lightGray);
-		plot.setDomainGridlinePaint(Color.white);
-		plot.setRangeGridlinePaint(Color.white);
-
-		final XYLineAndShapeRenderer renderer = new XYLineAndShapeRenderer();
-		renderer.setSeriesShapesVisible(0, false);
-		renderer.setSeriesShapesVisible(1, false);
-		plot.setRenderer(renderer);
-
-		// change the auto tick unit selection to integer units only...
-		final NumberAxis rangeAxis = (NumberAxis) plot.getRangeAxis();
-		rangeAxis.setStandardTickUnits(NumberAxis.createIntegerTickUnits());
-		// OPTIONAL CUSTOMISATION COMPLETED.
-
-		return chart;
-
-	}
-
-	@Override
-	public void paint(Graphics grphcs) {
-		super.paint(grphcs);
-	}
-
-	public void addall(double x, double y) {
-		this.secondSerie.add(this.time, y);
-		this.firstSerie.add(this.time, x);
-		XYSeriesCollection xs = new XYSeriesCollection();
-		xs.addSeries(firstSerie);
-		xs.addSeries(secondSerie);
-		this.time++;
-		this._dataset = xs;
-	}
-
-}

n2s3/src/main/resources/META-INF/MANIFEST.MF

-Manifest-Version: 1.0
-Class-Path: squants_2.11-0.5.3.jar akka-testkit_2.11-2.3.7.jar xchart-
- 3.3.1.jar jfreechart-1.0.17.jar nd4j-common-0.7.2.jar nd4j-native-0.7
- .2-android-x86.jar asm-5.0.4.jar protobuf-java-2.5.0.jar nd4j-native-
- platform-0.7.2.jar akka-cluster_2.11-2.3.7.jar commons-io-2.4.jar nd4
- j-native-0.7.2-android-arm.jar openblas-0.2.19-1.3-android-arm.jar ne
- tty-3.8.0.Final.jar commons-math3-3.2.jar scalameter-core_2.11-0.7.ja
- r scalameter_2.11-0.7.jar lombok-1.16.10.jar jackson-core-2.5.2.jar s
- tax2-api-3.1.4.jar openblas-0.2.19-1.3-linux-x86_64.jar scala-parser-
- combinators_2.11-1.0.1.jar scala-parser-combinators_2.11-1.0.3.jar ja
- ckson-module-scala_2.11-2.5.2.jar scala-swing_2.11-1.0.1.jar uncommon
- s-maths-1.2.2a.jar openblas-0.2.19-1.3-windows-x86_64.jar nd4j-contex
- t-0.7.2.jar nd4j-native-0.7.2-windows-x86_64.jar annotations-2.0.1.ja
- r nd4j-native-0.7.2-linux-ppc64le.jar nd4j-native-0.7.2.jar scala-xml
- _2.11-1.0.2.jar commons-math3-3.4.1.jar nd4s_2.11-0.7.2.jar openblas-
- 0.2.19-1.3-linux-ppc64le.jar openblas-0.2.19-1.3-macosx-x86_64.jar sl
- f4j-api-1.7.10.jar scalaxy-loops_2.11-0.3.4.jar openblas-0.2.19-1.3-a
- ndroid-x86.jar ascii-graphs_2.10-0.0.3.jar gpg-library_2.10-0.8.3.jar
-  commons-codec-1.4.jar commons-logging-1.1.1.jar jsr250-api-1.0.jar c
- di-api-1.0.jar javax.inject-1.jar dispatch-core_2.10-0.8.10.jar dispa
- tch-futures_2.10-0.8.10.jar dispatch-http_2.10-0.8.10.jar ant-launche
- r-1.9.6.jar ant-1.9.6.jar httpclient-4.1.3.jar httpcore-4.1.4.jar mav
- en-artifact-3.3.3.jar maven-model-3.3.3.jar maven-plugin-api-3.3.3.ja
- r bcpg-jdk15on-1.49.jar bcprov-jdk15on-1.49.jar plexus-classworlds-2.
- 5.2.jar plexus-component-annotations-1.5.5.jar plexus-utils-3.0.20.ja
- r org.eclipse.sisu.inject-0.3.0.jar org.eclipse.sisu.plexus-0.3.0.jar
-  asm-commons-5.0.4.jar asm-tree-5.0.4.jar asm-5.0.4.jar jarjar-1.6.0.
- jar scala-actors-2.10.6.jar scalactic_2.10-2.2.1.jar scalaz-core_2.10
- -7.0.2.jar scalaz-effect_2.10-7.0.2.jar sbt-assembly-0.14.3.jar sbt-m
- ulti-jvm-0.3.11.jar sbt-pgp-0.8.3.jar sbteclipse-core-2.5.0.jar sbtec
- lipse-plugin-2.5.0.jar sbt-dependency-graph-0.8.2.jar jansi.jar jline
- .jar scala-compiler.jar scala-library.jar scala-reflect.jar actions-0
- .13.13.jar api-0.13.13.jar apply-macro-0.13.13.jar cache-0.13.13.jar 
- classfile-0.13.13.jar classpath-0.13.13.jar collections-0.13.13.jar c
- ommand-0.13.13.jar compile-0.13.13.jar compiler-integration-0.13.13.j
- ar compiler-interface-0.13.13.jar compiler-ivy-integration-0.13.13.ja
- r completion-0.13.13.jar control-0.13.13.jar cross-0.13.13.jar increm
- ental-compiler-0.13.13.jar io-0.13.13.jar ivy-0.13.13.jar ivy-2.3.0-s
- bt-2cf13e211b2cb31f0d3b317289dca70eca3362f6.jar jansi-1.11.jar jawn-p
- arser_2.10-0.6.0.jar jline-2.13.jar jsch-0.1.50.jar json4s-ast_2.10-3
- .2.10.jar json4s-core_2.10-3.2.10.jar json4s-support_2.10-0.6.0.jar l
- auncher-interface-1.0.0-M1.jar logging-0.13.13.jar logic-0.13.13.jar 
- main-0.13.13.jar main-settings-0.13.13.jar paranamer-2.6.jar persist-
- 0.13.13.jar process-0.13.13.jar quasiquotes_2.10-2.0.1.jar relation-0
- .13.13.jar run-0.13.13.jar sbinary_2.10-0.4.2.jar sbt-0.13.13.jar sca
- la-pickling_2.10-0.10.1.jar scala-reflect-2.10.6.jar serialization_2.
- 10-0.1.2.jar task-system-0.13.13.jar tasks-0.13.13.jar template-resol
- ver-0.1.jar test-agent-0.13.13.jar test-interface-1.0.jar testing-0.1
- 3.13.jar tracking-0.13.13.jar interface-0.13.13.jar nd4j-native-0.7.2
- -linux-x86_64.jar guava-18.0.jar config-1.2.1.jar openblas-0.2.19-1.3
- .jar nd4j-api-0.7.2.jar nd4j-buffer-0.7.2.jar nd4j-native-0.7.2-macos
- x-x86_64.jar commons-lang3-3.4.jar reflections-0.9.10.jar test-interf
- ace-0.5.jar jcommon-1.0.21.jar scala-compiler-2.11.6.jar joda-time-2.
- 2.jar nd4j-native-api-0.7.2.jar akka-remote_2.11-2.3.7.jar paranamer-
- 2.6.jar snakeyaml-1.12.jar javacpp-1.3.1.jar javassist-3.18.2-GA.jar 
- jackson-databind-2.5.2.jar scala-reflect-2.11.6.jar scala-library-2.1
- 1.6.jar scala-chart_2.11-0.4.2.jar jackson-0.7.2.jar akka-actor_2.11-
- 2.3.7.jar scala-xml_2.11-1.0.3.jar jackson-annotations-2.5.2.jar xml-
- apis-1.3.04.jar jaer_2.11-1.0.jar scalaxy-streams_2.11-0.3.4.jar
-Main-Class: apps.xperium.Mnist1
-