Merge pull request #3 from petered/rename

Rename
petered · Feb 26, 2016 · 845fff7 · 845fff7
2 parents c58e6ca + 6af7c7a
commit 845fff7
Show file tree

Hide file tree

Showing 56 changed files with 126 additions and 122 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,7 @@
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+
+# Intellij Project files that shouldn't be shared
+**/.idea/workspace.xml 
+**/.idea/tasks.xml
diff --git a/deepstream_directory.py → deepspike_directory.py b/deepstream_directory.py → deepspike_directory.py
diff --git a/pom.xml b/pom.xml
@@ -3,11 +3,11 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>nl.UvA</groupId>
-  <artifactId>DeepStream</artifactId>
+  <artifactId>DeepSpike</artifactId>
   <version>1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
-  <name>DeepStream</name>
+  <name>DeepSpike</name>
   <url>http://maven.apache.org</url>
 
   <properties>

diff --git a/setup.py b/setup.py
@@ -1,10 +1,10 @@
 
 from setuptools import setup
 
-setup(name='DeepStream',
+setup(name='DeepSpike',
       author='Peter',
       author_email='[email protected]',
-      url='https://github.com/petered/deepstream',
+      url='https://github.com/petered/deepspike',
       long_description='A Java library for Spiking Deep Neural Networks',
       version=0,
       packages=[],

diff --git a/...eepstream/eavesdroppers/Eavesdropper.java → ...deepspike/eavesdroppers/Eavesdropper.java b/...eepstream/eavesdroppers/Eavesdropper.java → ...deepspike/eavesdroppers/Eavesdropper.java
@@ -1,8 +1,8 @@
-package nl.uva.deepstream.eavesdroppers;
+package nl.uva.deepspike.eavesdroppers;
 
-import nl.uva.deepstream.event_modules.BaseEavesdropper;
-import nl.uva.deepstream.events.VectorEvent;
-import nl.uva.deepstream.interfaces.EventModule;
+import nl.uva.deepspike.event_modules.BaseEavesdropper;
+import nl.uva.deepspike.events.VectorEvent;
+import nl.uva.deepspike.interfaces.EventModule;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...esdroppers/SpikeCountingEavesdropper.java → ...esdroppers/SpikeCountingEavesdropper.java b/...esdroppers/SpikeCountingEavesdropper.java → ...esdroppers/SpikeCountingEavesdropper.java
@@ -1,7 +1,7 @@
-package nl.uva.deepstream.eavesdroppers;
+package nl.uva.deepspike.eavesdroppers;
 
-import nl.uva.deepstream.event_modules.BaseEavesdropper;
-import nl.uva.deepstream.interfaces.EventModule;
+import nl.uva.deepspike.event_modules.BaseEavesdropper;
+import nl.uva.deepspike.interfaces.EventModule;
 
 /**
  * Created by peter on 2/24/16.

diff --git a/...tream/event_modules/BaseArgmaxHerder.java → ...spike/event_modules/BaseArgmaxHerder.java b/...tream/event_modules/BaseArgmaxHerder.java → ...spike/event_modules/BaseArgmaxHerder.java
@@ -1,7 +1,7 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
 import nl.uva.arrays.IVector;
-import nl.uva.deepstream.events.VectorEvent;
+import nl.uva.deepspike.events.VectorEvent;
 
 /**
  * Created by peter on 2/24/16.

diff --git a/...tream/event_modules/BaseEavesdropper.java → ...spike/event_modules/BaseEavesdropper.java b/...tream/event_modules/BaseEavesdropper.java → ...spike/event_modules/BaseEavesdropper.java
@@ -1,7 +1,7 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
-import nl.uva.deepstream.interfaces.EventHandler;
-import nl.uva.deepstream.interfaces.EventModule;
+import nl.uva.deepspike.interfaces.EventHandler;
+import nl.uva.deepspike.interfaces.EventModule;
 
 /**
  * Created by peter on 2/24/16.

diff --git a/...stream/event_modules/BaseEventModule.java → ...pspike/event_modules/BaseEventModule.java b/...stream/event_modules/BaseEventModule.java → ...pspike/event_modules/BaseEventModule.java
@@ -1,9 +1,9 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
-import nl.uva.deepstream.eavesdroppers.Eavesdropper;
-import nl.uva.deepstream.routers.SwitchBoard;
-import nl.uva.deepstream.interfaces.EventHandler;
-import nl.uva.deepstream.interfaces.EventModule;
+import nl.uva.deepspike.eavesdroppers.Eavesdropper;
+import nl.uva.deepspike.routers.SwitchBoard;
+import nl.uva.deepspike.interfaces.EventHandler;
+import nl.uva.deepspike.interfaces.EventModule;
 
 import java.util.List;
 

diff --git a/.../deepstream/event_modules/BaseHerder.java → ...a/deepspike/event_modules/BaseHerder.java b/.../deepstream/event_modules/BaseHerder.java → ...a/deepspike/event_modules/BaseHerder.java
@@ -1,8 +1,8 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
 import nl.uva.arrays.IVector;
 import nl.uva.arrays.VectorFactory;
-import nl.uva.deepstream.events.VectorEvent;
+import nl.uva.deepspike.events.VectorEvent;
 
 /**
  * Created by peter on 2/24/16.

diff --git a/...stream/event_modules/BaseQueueHerder.java → ...pspike/event_modules/BaseQueueHerder.java b/...stream/event_modules/BaseQueueHerder.java → ...pspike/event_modules/BaseQueueHerder.java
@@ -1,7 +1,7 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
-import nl.uva.deepstream.events.SignedSpikeEvent;
-import nl.uva.deepstream.events.VectorEvent;
+import nl.uva.deepspike.events.SignedSpikeEvent;
+import nl.uva.deepspike.events.VectorEvent;
 import java.util.PriorityQueue;
 
 /**

diff --git a/...pstream/event_modules/BaseSpikeEvent.java → ...epspike/event_modules/BaseSpikeEvent.java b/...pstream/event_modules/BaseSpikeEvent.java → ...epspike/event_modules/BaseSpikeEvent.java
@@ -1,4 +1,4 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
 /**
  * Created by peter on 2/24/16.

diff --git a/...ream/event_modules/BiVarArgmaxHerder.java → ...pike/event_modules/BiVarArgmaxHerder.java b/...ream/event_modules/BiVarArgmaxHerder.java → ...pike/event_modules/BiVarArgmaxHerder.java
@@ -1,7 +1,7 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
 import nl.uva.arrays.IVector;
-import nl.uva.deepstream.events.SignedSpikeEvent;
+import nl.uva.deepspike.events.SignedSpikeEvent;
 
 /**
  * Created by peter on 2/24/16.

diff --git a/...eam/event_modules/BooleanVectorEvent.java → ...ike/event_modules/BooleanVectorEvent.java b/...eam/event_modules/BooleanVectorEvent.java → ...ike/event_modules/BooleanVectorEvent.java
@@ -1,4 +1,4 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
 import nl.uva.arrays.BooleanVector;
 

diff --git a/...ream/event_modules/ColumnChangeEvent.java → ...pike/event_modules/ColumnChangeEvent.java b/...ream/event_modules/ColumnChangeEvent.java → ...pike/event_modules/ColumnChangeEvent.java
@@ -1,4 +1,4 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
 import nl.uva.arrays.IVector;
 

diff --git a/...deepstream/event_modules/CountModule.java → .../deepspike/event_modules/CountModule.java b/...deepstream/event_modules/CountModule.java → .../deepspike/event_modules/CountModule.java
@@ -1,7 +1,7 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
-import nl.uva.deepstream.events.SignedSpikeEvent;
-import nl.uva.deepstream.events.SpikeEvent;
+import nl.uva.deepspike.events.SignedSpikeEvent;
+import nl.uva.deepspike.events.SpikeEvent;
 
 import java.util.PriorityQueue;
 

diff --git a/...epstream/event_modules/DispatchEvent.java → ...eepspike/event_modules/DispatchEvent.java b/...epstream/event_modules/DispatchEvent.java → ...eepspike/event_modules/DispatchEvent.java
@@ -1,4 +1,4 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
 /**
  * Created by peter on 2/24/16.

diff --git a/...ream/event_modules/EventFilterModule.java → ...pike/event_modules/EventFilterModule.java b/...ream/event_modules/EventFilterModule.java → ...pike/event_modules/EventFilterModule.java
@@ -1,4 +1,4 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
 import nl.uva.arrays.BooleanVector;
 

diff --git a/...am/event_modules/EventGTFilterModule.java → ...ke/event_modules/EventGTFilterModule.java b/...am/event_modules/EventGTFilterModule.java → ...ke/event_modules/EventGTFilterModule.java
@@ -1,8 +1,8 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
 import nl.uva.arrays.IVector;
 import nl.uva.arrays.VectorFactory;
-import nl.uva.deepstream.events.VectorEvent;
+import nl.uva.deepspike.events.VectorEvent;
 
 /**
  * Created by peter on 2/24/16.

diff --git a/...pstream/event_modules/IdentityModule.java → ...epspike/event_modules/IdentityModule.java b/...pstream/event_modules/IdentityModule.java → ...epspike/event_modules/IdentityModule.java
@@ -1,4 +1,4 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
 /**
  * Created by peter on 2/24/16.

diff --git a/...odules/IncrementalOuterProductModule.java → ...odules/IncrementalOuterProductModule.java b/...odules/IncrementalOuterProductModule.java → ...odules/IncrementalOuterProductModule.java
@@ -1,10 +1,10 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
 import nl.uva.arrays.IVector;
 import nl.uva.arrays.VectorFactory;
-import nl.uva.deepstream.events.SignedSpikeEvent;
-import nl.uva.deepstream.events.SpikeEvent;
-import nl.uva.deepstream.events.VectorEvent;
+import nl.uva.deepspike.events.SignedSpikeEvent;
+import nl.uva.deepspike.events.SpikeEvent;
+import nl.uva.deepspike.events.VectorEvent;
 
 /**
  * Created by peter on 2/24/16.

diff --git a/...dules/NonResettingRectVarQueueHerder.java → ...dules/NonResettingRectVarQueueHerder.java b/...dules/NonResettingRectVarQueueHerder.java → ...dules/NonResettingRectVarQueueHerder.java
@@ -1,4 +1,4 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
 /**
  * Created by peter on 2/24/16.

diff --git a/...t_modules/NonResettingVarQueueHerder.java → ...t_modules/NonResettingVarQueueHerder.java b/...t_modules/NonResettingVarQueueHerder.java → ...t_modules/NonResettingVarQueueHerder.java
@@ -1,4 +1,4 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
 /**
  * Created by peter on 2/24/16.

diff --git a/...eam/event_modules/OuterProductModule.java → ...ike/event_modules/OuterProductModule.java b/...eam/event_modules/OuterProductModule.java → ...ike/event_modules/OuterProductModule.java
@@ -1,12 +1,12 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
 import nl.uva.arrays.IMatrix;
 import nl.uva.arrays.IVector;
 import nl.uva.arrays.VectorFactory;
-import nl.uva.deepstream.events.MatrixEvent;
-import nl.uva.deepstream.events.SignedSpikeEvent;
-import nl.uva.deepstream.events.SpikeEvent;
-import nl.uva.deepstream.events.VectorEvent;
+import nl.uva.deepspike.events.MatrixEvent;
+import nl.uva.deepspike.events.SignedSpikeEvent;
+import nl.uva.deepspike.events.SpikeEvent;
+import nl.uva.deepspike.events.VectorEvent;
 
 /**
  * Created by peter on 2/24/16.

diff --git a/...m/event_modules/PassThroughQuantizer.java → ...e/event_modules/PassThroughQuantizer.java b/...m/event_modules/PassThroughQuantizer.java → ...e/event_modules/PassThroughQuantizer.java
@@ -1,7 +1,7 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
-import nl.uva.deepstream.events.SignedSpikeEvent;
-import nl.uva.deepstream.interfaces.Quantizer;
+import nl.uva.deepspike.events.SignedSpikeEvent;
+import nl.uva.deepspike.interfaces.Quantizer;
 
 /**
  * Created by peter on 2/24/16.

diff --git a/...epstream/event_modules/PoissonHerder.java → ...eepspike/event_modules/PoissonHerder.java b/...epstream/event_modules/PoissonHerder.java → ...eepspike/event_modules/PoissonHerder.java
@@ -1,8 +1,8 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
 import nl.uva.arrays.IVector;
 import nl.uva.arrays.VectorFactory;
-import nl.uva.deepstream.events.SignedSpikeEvent;
+import nl.uva.deepspike.events.SignedSpikeEvent;
 
 import java.util.Random;
 

diff --git a/...tream/event_modules/QuantizerFactory.java → ...spike/event_modules/QuantizerFactory.java b/...tream/event_modules/QuantizerFactory.java → ...spike/event_modules/QuantizerFactory.java
@@ -1,4 +1,4 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
 import nl.uva.arrays.VectorFactory;
 

diff --git a/...modules/RandomShiftedThresholdHerder.java → ...modules/RandomShiftedThresholdHerder.java b/...modules/RandomShiftedThresholdHerder.java → ...modules/RandomShiftedThresholdHerder.java
@@ -1,4 +1,4 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
 import java.util.Random;
 

diff --git a/...eam/event_modules/RectVarQueueHerder.java → ...ike/event_modules/RectVarQueueHerder.java b/...eam/event_modules/RectVarQueueHerder.java → ...ike/event_modules/RectVarQueueHerder.java
@@ -1,7 +1,7 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
-import nl.uva.deepstream.events.SpikeEvent;
-import nl.uva.deepstream.interfaces.Quantizer;
+import nl.uva.deepspike.events.SpikeEvent;
+import nl.uva.deepspike.interfaces.Quantizer;
 
 /**
  * Created by peter on 2/24/16.

diff --git a/...am/event_modules/ReverseWeightModule.java → ...ke/event_modules/ReverseWeightModule.java b/...am/event_modules/ReverseWeightModule.java → ...ke/event_modules/ReverseWeightModule.java
@@ -1,9 +1,9 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
 import nl.uva.arrays.IMatrix;
 import nl.uva.arrays.IVector;
-import nl.uva.deepstream.events.SignedSpikeEvent;
-import nl.uva.deepstream.events.VectorEvent;
+import nl.uva.deepspike.events.SignedSpikeEvent;
+import nl.uva.deepspike.events.VectorEvent;
 
 /**
  * Created by peter on 2/24/16.

diff --git a/..._modules/ScaledNoResetRoundingHerder.java → ..._modules/ScaledNoResetRoundingHerder.java b/..._modules/ScaledNoResetRoundingHerder.java → ..._modules/ScaledNoResetRoundingHerder.java
@@ -1,4 +1,4 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
 /**
  * Created by peter on 2/24/16.

diff --git a/...ent_modules/ScaledRectRoundingHerder.java → ...ent_modules/ScaledRectRoundingHerder.java b/...ent_modules/ScaledRectRoundingHerder.java → ...ent_modules/ScaledRectRoundingHerder.java
@@ -1,7 +1,7 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
-import nl.uva.deepstream.events.SpikeEvent;
-import nl.uva.deepstream.interfaces.Quantizer;
+import nl.uva.deepspike.events.SpikeEvent;
+import nl.uva.deepspike.interfaces.Quantizer;
 
 /**
  * Created by peter on 2/24/16.

diff --git a/...m/event_modules/ScaledRoundingHerder.java → ...e/event_modules/ScaledRoundingHerder.java b/...m/event_modules/ScaledRoundingHerder.java → ...e/event_modules/ScaledRoundingHerder.java
@@ -1,6 +1,6 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
-import nl.uva.deepstream.events.SignedSpikeEvent;
+import nl.uva.deepspike.events.SignedSpikeEvent;
 
 /**
  * Created by peter on 2/24/16.

diff --git a/...am/event_modules/SpikeWeighterModule.java → ...ke/event_modules/SpikeWeighterModule.java b/...am/event_modules/SpikeWeighterModule.java → ...ke/event_modules/SpikeWeighterModule.java
@@ -1,6 +1,6 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
-import nl.uva.deepstream.events.SignedSpikeEvent;
+import nl.uva.deepspike.events.SignedSpikeEvent;
 
 /**
  * Created by peter on 2/24/16.

diff --git a/...ent_modules/StatelessBaseEventModule.java → ...ent_modules/StatelessBaseEventModule.java b/...ent_modules/StatelessBaseEventModule.java → ...ent_modules/StatelessBaseEventModule.java
@@ -1,4 +1,4 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
 /**
  * Created by peter on 2/24/16.

diff --git a/...stream/event_modules/VarArgmaxHerder.java → ...pspike/event_modules/VarArgmaxHerder.java b/...stream/event_modules/VarArgmaxHerder.java → ...pspike/event_modules/VarArgmaxHerder.java
@@ -1,8 +1,8 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
-import nl.uva.deepstream.events.SignedSpikeEvent;
-import nl.uva.deepstream.events.SpikeEvent;
-import nl.uva.deepstream.interfaces.Quantizer;
+import nl.uva.deepspike.events.SignedSpikeEvent;
+import nl.uva.deepspike.events.SpikeEvent;
+import nl.uva.deepspike.interfaces.Quantizer;
 
 /**
  * Created by peter on 2/24/16.

diff --git a/...pstream/event_modules/VarQueueHerder.java → ...epspike/event_modules/VarQueueHerder.java b/...pstream/event_modules/VarQueueHerder.java → ...epspike/event_modules/VarQueueHerder.java
@@ -1,6 +1,6 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
-import nl.uva.deepstream.events.SignedSpikeEvent;
+import nl.uva.deepspike.events.SignedSpikeEvent;
 
 /**
  * Created by peter on 2/24/16.

diff --git a/...stream/event_modules/VectorSumModule.java → ...pspike/event_modules/VectorSumModule.java b/...stream/event_modules/VectorSumModule.java → ...pspike/event_modules/VectorSumModule.java
@@ -1,10 +1,10 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
 import nl.uva.arrays.IVector;
 import nl.uva.arrays.VectorFactory;
-import nl.uva.deepstream.events.SignedSpikeEvent;
-import nl.uva.deepstream.events.SpikeEvent;
-import nl.uva.deepstream.events.VectorEvent;
+import nl.uva.deepspike.events.SignedSpikeEvent;
+import nl.uva.deepspike.events.SpikeEvent;
+import nl.uva.deepspike.events.VectorEvent;
 
 /**
  * Created by peter on 2/24/16.

diff --git a/.../event_modules/VectorThresholdModule.java → .../event_modules/VectorThresholdModule.java b/.../event_modules/VectorThresholdModule.java → .../event_modules/VectorThresholdModule.java
@@ -1,7 +1,7 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
 import nl.uva.arrays.BooleanVector;
-import nl.uva.deepstream.events.VectorEvent;
+import nl.uva.deepspike.events.VectorEvent;
 
 /**
  * Created by peter on 2/24/16.

diff --git a/...m/event_modules/WeightGradientModule.java → ...e/event_modules/WeightGradientModule.java b/...m/event_modules/WeightGradientModule.java → ...e/event_modules/WeightGradientModule.java
@@ -1,9 +1,9 @@
-package nl.uva.deepstream.event_modules;
+package nl.uva.deepspike.event_modules;
 
-import nl.uva.deepstream.events.SignedSpikeEvent;
-import nl.uva.deepstream.events.SpikeEvent;
-import nl.uva.deepstream.events.VectorEvent;
-import nl.uva.deepstream.interfaces.EventModule;
+import nl.uva.deepspike.events.SignedSpikeEvent;
+import nl.uva.deepspike.events.SpikeEvent;
+import nl.uva.deepspike.events.VectorEvent;
+import nl.uva.deepspike.interfaces.EventModule;
 
 /**
  * Created by peter on 2/24/16.