From 63761554936304499d3f6f0fc8833a3eb8acf9d5 Mon Sep 17 00:00:00 2001
From: Hammouda Elbez <hammouda.elbez@univ-lille.fr>
Date: Tue, 25 Jul 2023 11:31:27 +0200
Subject: [PATCH] Mongodb issues fixed
---
.../emeraude/n2s3/core/ConnectionIndex.scala | 1 +
.../cristal/emeraude/n2s3/apps/ExampleMnist2.scala | 13 ++++++-------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/core/ConnectionIndex.scala b/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/core/ConnectionIndex.scala
index 5cca257..94937a0 100644
--- a/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/core/ConnectionIndex.scala
+++ b/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/core/ConnectionIndex.scala
@@ -18,6 +18,7 @@ class ConnectionIndex(inputLayer : NeuronGroupRef, outputLayer : NeuronGroupRef)
}
}.toMap
+
def getConnectionsBetween(input : NetworkEntityPath, output : NetworkEntityPath) : Seq[ConnectionPath] = {
index.getOrElse(output, Map()).getOrElse(input, Seq())
}
diff --git a/n2s3_examples/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/apps/ExampleMnist2.scala b/n2s3_examples/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/apps/ExampleMnist2.scala
index 03cc19d..9e3ee29 100644
--- a/n2s3_examples/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/apps/ExampleMnist2.scala
+++ b/n2s3_examples/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/apps/ExampleMnist2.scala
@@ -101,18 +101,20 @@ object ExampleMnist2 extends App {
val unsupervisedLayer1 = n2s3.createNeuronGroup()
.setIdentifier("Layer1")
- .setNumberOfNeurons(5)
+ .setNumberOfNeurons(20)
.setNeuronModel(LIF, Seq(
- (MembranePotentialThreshold, 35 millivolts)))
+ (MembranePotentialThreshold, 15 millivolts)))
val unsupervisedLayer2 = n2s3.createNeuronGroup()
.setIdentifier("Layer2")
- .setNumberOfNeurons(5)
+ .setNumberOfNeurons(10)
.setNeuronModel(LIF, Seq(
(MembranePotentialThreshold, 5 millivolts)))
inputLayer.connectTo(unsupervisedLayer1, new FullConnection(() => new SimplifiedSTDP()))
var Layer1WTAconnection = unsupervisedLayer1.connectTo(unsupervisedLayer1, new FullConnection(() => new InhibitorySynapse()))
+ unsupervisedLayer1.connectTo(unsupervisedLayer2, new FullConnection(() => new SimplifiedSTDP()))
+ var Layer2WTAconnection = unsupervisedLayer2.connectTo(unsupervisedLayer2, new FullConnection(() => new InhibitorySynapse()))
n2s3.create()
@@ -161,7 +163,6 @@ object ExampleMnist2 extends App {
simTime = "Train L1"
n2s3.runAndWait()
- println(System.currentTimeMillis() - globalTime)
simTime = simTime + " | " + (System.currentTimeMillis() - globalTime) + "\n"
if (log) {
@@ -172,8 +173,6 @@ object ExampleMnist2 extends App {
unsupervisedLayer1.fixNeurons()
Layer1WTAconnection.disconnect()
- unsupervisedLayer1.connectTo(unsupervisedLayer2, new FullConnection(() => new SimplifiedSTDP()))
- var Layer2WTAconnection = unsupervisedLayer2.connectTo(unsupervisedLayer2, new FullConnection(() => new InhibitorySynapse()))
n2s3.first = false
stream = InputMnist.DataParts(dataFile, labelFile, sizeChunk, sizeChunk)
inputStream.append(stream)
@@ -181,7 +180,7 @@ object ExampleMnist2 extends App {
println("Start Training L2")
var layerTolayerIndex = new ConnectionIndex(unsupervisedLayer1, unsupervisedLayer2)
- print(layerTolayerIndex)
+
var listOfConnexions2 = for (outputIndex <- 0 until unsupervisedLayer2.shape.getNumberOfPoints) yield {
for (_ <- 0 until 1) yield {
for {
--
GitLab