From efd99df1ca03ce46a47b1739d03bf9c4e7673ea4 Mon Sep 17 00:00:00 2001 From: guille <guillermopolito@gmail.com> Date: Fri, 28 Oct 2016 11:42:54 +0200 Subject: [PATCH] Moved InputOutputGraphNetworkObserver to logging package --- .../features/logging}/InputOutputGraphNetworkObserver.scala | 4 ++-- .../cristal/emeraude/n2s3/apps/ExampleFreeWay.scala | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename n2s3/src/main/{scala/fr/univ_lille/cristal/emeraude/n2s3/features/builder => java/fr/univ_lille/cristal/emeraude/n2s3/features/logging}/InputOutputGraphNetworkObserver.scala (80%) diff --git a/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/features/builder/InputOutputGraphNetworkObserver.scala b/n2s3/src/main/java/fr/univ_lille/cristal/emeraude/n2s3/features/logging/InputOutputGraphNetworkObserver.scala similarity index 80% rename from n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/features/builder/InputOutputGraphNetworkObserver.scala rename to n2s3/src/main/java/fr/univ_lille/cristal/emeraude/n2s3/features/logging/InputOutputGraphNetworkObserver.scala index 049c9918..8626b173 100644 --- a/n2s3/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/features/builder/InputOutputGraphNetworkObserver.scala +++ b/n2s3/src/main/java/fr/univ_lille/cristal/emeraude/n2s3/features/logging/InputOutputGraphNetworkObserver.scala @@ -1,7 +1,7 @@ -package fr.univ_lille.cristal.emeraude.n2s3.features.builder +package fr.univ_lille.cristal.emeraude.n2s3.features.logging import akka.actor.{ActorRef, Props} -import fr.univ_lille.cristal.emeraude.n2s3.features.logging.NeuronInputOutputGraph +import fr.univ_lille.cristal.emeraude.n2s3.features.builder.{N2S3, NeuronGroupObserverRef, NeuronGroupRef} import fr.univ_lille.cristal.emeraude.n2s3.support.actors.LocalActorDeploymentStrategy /** diff --git a/n2s3_examples/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/apps/ExampleFreeWay.scala b/n2s3_examples/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/apps/ExampleFreeWay.scala index 666540ff..51fb014e 100644 --- a/n2s3_examples/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/apps/ExampleFreeWay.scala +++ b/n2s3_examples/src/main/scala/fr/univ_lille/cristal/emeraude/n2s3/apps/ExampleFreeWay.scala @@ -8,12 +8,12 @@ import fr.univ_lille.cristal.emeraude.n2s3.core.Synchronizer.Done import fr.univ_lille.cristal.emeraude.n2s3.core._ import fr.univ_lille.cristal.emeraude.n2s3.core.actors.Config import fr.univ_lille.cristal.emeraude.n2s3.core.models.properties._ +import fr.univ_lille.cristal.emeraude.n2s3.features.builder.N2S3 import fr.univ_lille.cristal.emeraude.n2s3.features.builder.connection.types.FullConnection -import fr.univ_lille.cristal.emeraude.n2s3.features.builder.{InputOutputGraphNetworkObserver, N2S3} import fr.univ_lille.cristal.emeraude.n2s3.features.io.input.N2S3InputStreamCombinators._ import fr.univ_lille.cristal.emeraude.n2s3.features.io.input._ import fr.univ_lille.cristal.emeraude.n2s3.features.io.report.{ImageSynapsesWeight, ReconstructSynapsesWeight} -import fr.univ_lille.cristal.emeraude.n2s3.features.logging.NeuronsFireLogText +import fr.univ_lille.cristal.emeraude.n2s3.features.logging.{InputOutputGraphNetworkObserver, NeuronsFireLogText} import fr.univ_lille.cristal.emeraude.n2s3.models.qbg._ import fr.univ_lille.cristal.emeraude.n2s3.support.UnitCast._ import fr.univ_lille.cristal.emeraude.n2s3.support.actors.LocalActorDeploymentStrategy -- GitLab