pybrainsim-activity

[Pybrainsim-activity] SF.net SVN: pybrainsim:[9] trunk/src/PyBrainSim.py

[<rg...@us...>]

Revision: 9
          http://pybrainsim.svn.sourceforge.net/pybrainsim/?rev=9&view=rev
Author:   rgoj
Date:     2009-07-24 13:10:09 +0000 (Fri, 24 Jul 2009)

Log Message:
-----------
* A new example Stimulus object and a connection to one of the generators are created in the PyBrainSim.py example script

Modified Paths:
--------------
    trunk/src/PyBrainSim.py

Modified: trunk/src/PyBrainSim.py
===================================================================
--- trunk/src/PyBrainSim.py	2009-07-24 12:24:38 UTC (rev 8)
+++ trunk/src/PyBrainSim.py	2009-07-24 13:10:09 UTC (rev 9)
@@ -27,6 +27,7 @@
 from Head import Head
 from Generator import Generator
 from Connection import Connection
+from Stimulus import Stimulus
 
 exampleHead = Head()
 exampleHead.setSamplingFrequency(32)
@@ -41,5 +42,11 @@
 exampleConnection = Connection(exampleGenerator1, exampleGenerator2)
 exampleHead.addConnection(exampleConnection)
 
+exampleStimulus = Stimulus()
+exampleHead.addGenerator(exampleStimulus)
+
+exampleStimulusConnection = Connection(exampleStimulus, exampleGenerator1)
+exampleHead.addConnection(exampleStimulusConnection)
+
 recording = exampleHead.runSimulation(1)
 print recording


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pybrainsim-activity] SF.net SVN: pybrainsim:[13] trunk/src/PyBrainSim.py

[<rg...@us...>]

Revision: 13
          http://pybrainsim.svn.sourceforge.net/pybrainsim/?rev=13&view=rev
Author:   rgoj
Date:     2009-07-24 13:50:55 +0000 (Fri, 24 Jul 2009)

Log Message:
-----------
* Added a second connection between the exampleStimulus and the generator, so that data can be transmitted both ways

Modified Paths:
--------------
    trunk/src/PyBrainSim.py

Modified: trunk/src/PyBrainSim.py
===================================================================
--- trunk/src/PyBrainSim.py	2009-07-24 13:49:33 UTC (rev 12)
+++ trunk/src/PyBrainSim.py	2009-07-24 13:50:55 UTC (rev 13)
@@ -45,8 +45,10 @@
 exampleStimulus = Stimulus()
 exampleHead.addGenerator(exampleStimulus)
 
-exampleStimulusConnection = Connection(exampleStimulus, exampleGenerator1)
-exampleHead.addConnection(exampleStimulusConnection)
+exampleStimulusToGeneratorConnection = Connection(exampleStimulus, exampleGenerator1)
+exampleGeneratorToStimulusConnection = Connection(exampleGenerator1, exampleStimulus)
+exampleHead.addConnection(exampleGeneratorToStimulusConnection)
+exampleHead.addConnection(exampleStimulusToGeneratorConnection)
 
 recording = exampleHead.runSimulation(1)
 print recording


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pybrainsim-activity] SF.net SVN: pybrainsim:[17] trunk/src/PyBrainSim.py

[<rg...@us...>]

Revision: 17
          http://pybrainsim.svn.sourceforge.net/pybrainsim/?rev=17&view=rev
Author:   rgoj
Date:     2009-07-28 09:33:26 +0000 (Tue, 28 Jul 2009)

Log Message:
-----------
* Implemented a simple text menu in PyBrainSim that would enable the user to choose the simulation to be performed

Modified Paths:
--------------
    trunk/src/PyBrainSim.py

Modified: trunk/src/PyBrainSim.py
===================================================================
--- trunk/src/PyBrainSim.py	2009-07-28 07:34:55 UTC (rev 16)
+++ trunk/src/PyBrainSim.py	2009-07-28 09:33:26 UTC (rev 17)
@@ -29,26 +29,41 @@
 from DummyConnection import DummyConnection
 from ActivationZeroingStimulusGenerator import ActivationZeroingStimulusGenerator
 
-exampleHead = Head()
-exampleHead.setSamplingFrequency(32)
-exampleHead.addRegistrationSite([0, 0, 0])
-exampleHead.addRegistrationSite([0, 0, 0])
+welcomeMessage = "\n\
+Welcome to this early version of PyBrainSim\n\n\
+Choose the type of simulation you would like to perform:\n\
+    1. Adding numbers\n\
+    2. Sinusoidal generator\n"
 
-exampleGenerator1 = DummyGenerator()
-exampleGenerator2 = DummyGenerator()
-exampleHead.addGenerator(exampleGenerator1)
-exampleHead.addGenerator(exampleGenerator2)
+print(welcomeMessage)
+userChoice = input("Your choice: ")
+print("\n")
 
-exampleConnection = DummyConnection(exampleGenerator1, exampleGenerator2)
-exampleHead.addConnection(exampleConnection)
-
-exampleStimulus = ActivationZeroingStimulusGenerator()
-exampleHead.addGenerator(exampleStimulus)
-
-exampleStimulusToGeneratorConnection = DummyConnection(exampleStimulus, exampleGenerator1)
-exampleGeneratorToStimulusConnection = DummyConnection(exampleGenerator1, exampleStimulus)
-exampleHead.addConnection(exampleGeneratorToStimulusConnection)
-exampleHead.addConnection(exampleStimulusToGeneratorConnection)
-
-recording = exampleHead.runSimulation(1)
-print recording
+if userChoice == 1:
+    exampleHead = Head()
+    exampleHead.setSamplingFrequency(32)
+    exampleHead.addRegistrationSite([0, 0, 0])
+    exampleHead.addRegistrationSite([0, 0, 0])
+    
+    exampleGenerator1 = DummyGenerator()
+    exampleGenerator2 = DummyGenerator()
+    exampleHead.addGenerator(exampleGenerator1)
+    exampleHead.addGenerator(exampleGenerator2)
+    
+    exampleConnection = DummyConnection(exampleGenerator1, exampleGenerator2)
+    exampleHead.addConnection(exampleConnection)
+    
+    exampleStimulus = ActivationZeroingStimulusGenerator()
+    exampleHead.addGenerator(exampleStimulus)
+    
+    exampleStimulusToGeneratorConnection = DummyConnection(exampleStimulus, exampleGenerator1)
+    exampleGeneratorToStimulusConnection = DummyConnection(exampleGenerator1, exampleStimulus)
+    exampleHead.addConnection(exampleGeneratorToStimulusConnection)
+    exampleHead.addConnection(exampleStimulusToGeneratorConnection)
+    
+    recording = exampleHead.runSimulation(1)
+    print recording
+elif userChoice == 2:
+    print("Oops, this has not yet been implemented...")
+else:
+    print("No such option unfortunately...")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pybrainsim-activity] SF.net SVN: pybrainsim:[21] trunk/src/PyBrainSim.py

[<rg...@us...>]

Revision: 21
          http://pybrainsim.svn.sourceforge.net/pybrainsim/?rev=21&view=rev
Author:   rgoj
Date:     2009-07-28 09:56:17 +0000 (Tue, 28 Jul 2009)

Log Message:
-----------
* Prepared an example of using the SineGenerator class in the PyBrainSim.py script. It does nothing more than invoke the generator and print out it's output... which is a sine.

Modified Paths:
--------------
    trunk/src/PyBrainSim.py

Modified: trunk/src/PyBrainSim.py
===================================================================
--- trunk/src/PyBrainSim.py	2009-07-28 09:49:19 UTC (rev 20)
+++ trunk/src/PyBrainSim.py	2009-07-28 09:56:17 UTC (rev 21)
@@ -26,6 +26,7 @@
 
 from Head import Head
 from DummyGenerator import DummyGenerator
+from SineGenerator import SineGenerator
 from DummyConnection import DummyConnection
 from ActivationZeroingStimulusGenerator import ActivationZeroingStimulusGenerator
 
@@ -64,6 +65,22 @@
     recording = exampleHead.runSimulation(1)
     print recording
 elif userChoice == 2:
-    print("Oops, this has not yet been implemented...")
+    exampleHead = Head()
+    exampleHead.setSamplingFrequency(32)
+    exampleHead.addRegistrationSite([0, 0, 0])
+    
+    exampleGenerator1 = SineGenerator()
+    exampleHead.addGenerator(exampleGenerator1)
+    
+    #exampleStimulus = ActivationZeroingStimulusGenerator()
+    #exampleHead.addGenerator(exampleStimulus)
+    
+    #exampleStimulusToGeneratorConnection = DummyConnection(exampleStimulus, exampleGenerator1)
+    #exampleGeneratorToStimulusConnection = DummyConnection(exampleGenerator1, exampleStimulus)
+    #exampleHead.addConnection(exampleGeneratorToStimulusConnection)
+    #exampleHead.addConnection(exampleStimulusToGeneratorConnection)
+    
+    recording = exampleHead.runSimulation(1)
+    print recording
 else:
     print("No such option unfortunately...")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pybrainsim-activity] SF.net SVN: pybrainsim:[23] trunk/src/PyBrainSim.py

[<rg...@us...>]

Revision: 23
          http://pybrainsim.svn.sourceforge.net/pybrainsim/?rev=23&view=rev
Author:   rgoj
Date:     2009-07-29 08:54:47 +0000 (Wed, 29 Jul 2009)

Log Message:
-----------
* We will now be using a new class, called Experiment to store all the data related to the experiment, changes made to PyBrainSim.py to make it use that class

Modified Paths:
--------------
    trunk/src/PyBrainSim.py

Modified: trunk/src/PyBrainSim.py
===================================================================
--- trunk/src/PyBrainSim.py	2009-07-28 09:57:14 UTC (rev 22)
+++ trunk/src/PyBrainSim.py	2009-07-29 08:54:47 UTC (rev 23)
@@ -25,6 +25,7 @@
 """
 
 from Head import Head
+from Experiment import Experiment
 from DummyGenerator import DummyGenerator
 from SineGenerator import SineGenerator
 from DummyConnection import DummyConnection
@@ -62,8 +63,8 @@
     exampleHead.addConnection(exampleGeneratorToStimulusConnection)
     exampleHead.addConnection(exampleStimulusToGeneratorConnection)
     
-    recording = exampleHead.runSimulation(1)
-    print recording
+    exampleExperiment = Experiment(exampleHead.runSimulation(1))
+    print exampleExperiment.getRecording()
 elif userChoice == 2:
     exampleHead = Head()
     exampleHead.setSamplingFrequency(32)
@@ -80,7 +81,7 @@
     #exampleHead.addConnection(exampleGeneratorToStimulusConnection)
     #exampleHead.addConnection(exampleStimulusToGeneratorConnection)
     
-    recording = exampleHead.runSimulation(1)
-    print recording
+    exampleExperiment = Experiment(exampleHead.runSimulation(1))
+    print exampleExperiment.getRecording()
 else:
     print("No such option unfortunately...")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pybrainsim-activity] SF.net SVN: pybrainsim:[30] trunk/src/PyBrainSim.py

[<rg...@us...>]

Revision: 30
          http://pybrainsim.svn.sourceforge.net/pybrainsim/?rev=30&view=rev
Author:   rgoj
Date:     2009-07-31 09:16:05 +0000 (Fri, 31 Jul 2009)

Log Message:
-----------
* Reformat file so that it has correct column width for documentation

Modified Paths:
--------------
    trunk/src/PyBrainSim.py

Modified: trunk/src/PyBrainSim.py
===================================================================
--- trunk/src/PyBrainSim.py	2009-07-29 15:11:03 UTC (rev 29)
+++ trunk/src/PyBrainSim.py	2009-07-31 09:16:05 UTC (rev 30)
@@ -3,23 +3,25 @@
 #
 # This file is part of PyBrainSim.
 #
-# PyBrainSim is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# PyBrainSim is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option) any later
+# version.
 #
-# PyBrainSim is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# PyBrainSim is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
-# along with PyBrainSim.  If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU General Public License along with
+# PyBrainSim.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-PyBrainSim is an interactive tool for the simulation and visualization of the electromagnetic activity of the brain, currently under development.
+PyBrainSim is an interactive tool for the simulation and visualization of the
+electromagnetic activity of the brain, currently under development.
 
-This script can be executed to run an example simulation, using the Head and GeneratorDummy classes. Currently it only generates a list of integer numbers... but work is under way to make it simulate the brain... Have fun!
+This script can be executed to run an example simulation, using the Head and
+GeneratorDummy classes. Currently it only generates a list of integer
+numbers... but work is under way to make it simulate the brain... Have fun!
 
 pybrainsim.sourceforge.net
 """
@@ -29,7 +31,7 @@
 from GeneratorDummy import GeneratorDummy
 from GeneratorSine import GeneratorSine
 from ConnectionSimple import ConnectionSimple
-from GeneratorStimulusActivationZeroing import GeneratorStimulusActivationZeroing
+from GeneratorStimulusActivationZeroing import GeneratorStimulusActivationZeroing 
 from GeneratorStimulusPhaseReset import GeneratorStimulusPhaseReset
 
 welcomeMessage = "\n\
@@ -47,46 +49,46 @@
     exampleHead.setSamplingFrequency(32)
     exampleHead.addRegistrationSite([0, 0, 0])
     exampleHead.addRegistrationSite([0, 0, 0])
-    
+
     exampleGenerator1 = GeneratorDummy()
     exampleGenerator2 = GeneratorDummy()
     exampleHead.addGenerator(exampleGenerator1)
     exampleHead.addGenerator(exampleGenerator2)
-    
+
     exampleConnection = ConnectionSimple(exampleGenerator1, exampleGenerator2)
     exampleHead.addConnection(exampleConnection)
-    
+
     exampleStimulus = GeneratorStimulusActivationZeroing()
     exampleHead.addGenerator(exampleStimulus)
-    
+
     exampleStimulusToGeneratorConnection = ConnectionSimple(exampleStimulus, exampleGenerator1)
     exampleGeneratorToStimulusConnection = ConnectionSimple(exampleGenerator1, exampleStimulus)
     exampleHead.addConnection(exampleStimulusToGeneratorConnection)
     exampleHead.addConnection(exampleGeneratorToStimulusConnection)
-    
-    exampleExperiment = Experiment(exampleHead.runSimulation(1))
+
+    exampleExperiment = Experiment(exampleHead.runSimulation( 1 ))
     print exampleExperiment.getRecording()
 elif userChoice == 2:
     exampleExperiment = Experiment()
-    exampleExperiment.addStimulusTime(0.2341)
-    
+    exampleExperiment.addStimulusTime( 0.2341 )
+
     exampleHead = Head()
-    exampleHead.setSamplingFrequency(10)
+    exampleHead.setSamplingFrequency( 10 )
     exampleHead.addRegistrationSite([0, 0, 0])
-    
+
     exampleGenerator1 = GeneratorSine()
     exampleHead.addGenerator(exampleGenerator1)
-    
+
     exampleStimulus = GeneratorStimulusPhaseReset()
     exampleStimulus.setStimulusTimes(exampleExperiment.getStimulusTimes())
     exampleHead.addGenerator(exampleStimulus)
-    
+
     exampleStimulusToGeneratorConnection = ConnectionSimple(exampleStimulus, exampleGenerator1)
     exampleGeneratorToStimulusConnection = ConnectionSimple(exampleGenerator1, exampleStimulus)
     exampleHead.addConnection(exampleGeneratorToStimulusConnection)
     exampleHead.addConnection(exampleStimulusToGeneratorConnection)
-    
-    exampleExperiment.setRecording(exampleHead.runSimulation(1.1))
+
+    exampleExperiment.setRecording(exampleHead.runSimulation( 1.1 ))
     print exampleExperiment.getRecording()
 else:
     print("No such option unfortunately...")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pybrainsim-activity] SF.net SVN: pybrainsim:[33] trunk/src/PyBrainSim.py

[<rg...@us...>]

Revision: 33
          http://pybrainsim.svn.sourceforge.net/pybrainsim/?rev=33&view=rev
Author:   rgoj
Date:     2009-08-02 16:23:15 +0000 (Sun, 02 Aug 2009)

Log Message:
-----------
* Adding an example dummy simulation to the PyBrainSim.py script
** Using GeneratorDummy and ConnectionDummy we print out to standard output information about the currently running method
* The other two previous simulations in PyBrainSim are commented out for refactoring of used methods

Modified Paths:
--------------
    trunk/src/PyBrainSim.py

Modified: trunk/src/PyBrainSim.py
===================================================================
--- trunk/src/PyBrainSim.py	2009-08-02 15:31:17 UTC (rev 32)
+++ trunk/src/PyBrainSim.py	2009-08-02 16:23:15 UTC (rev 33)
@@ -28,17 +28,20 @@
 
 from Head import Head
 from Experiment import Experiment
+
 from GeneratorDummy import GeneratorDummy
+from ConnectionDummy import ConnectionDummy
+
 from GeneratorSine import GeneratorSine
-from ConnectionSimple import ConnectionSimple
 from GeneratorStimulusActivationZeroing import GeneratorStimulusActivationZeroing 
 from GeneratorStimulusPhaseReset import GeneratorStimulusPhaseReset
 
 welcomeMessage = "\n\
 Welcome to this early version of PyBrainSim\n\n\
 Choose the type of simulation you would like to perform:\n\
-    1. Adding numbers\n\
-    2. Sinusoidal generator\n"
+    1. Example dummy simulation\n\
+    2. Adding numbers\n\
+    3. Sinusoidal generator\n"
 
 print(welcomeMessage)
 userChoice = input("Your choice: ")
@@ -46,49 +49,64 @@
 
 if userChoice == 1:
     exampleHead = Head()
-    exampleHead.setSamplingFrequency(32)
+    exampleHead.setSamplingFrequency(10)
     exampleHead.addRegistrationSite([0, 0, 0])
-    exampleHead.addRegistrationSite([0, 0, 0])
 
-    exampleGenerator1 = GeneratorDummy()
-    exampleGenerator2 = GeneratorDummy()
+    exampleGenerator1 = GeneratorDummy('Gen1')
+    exampleGenerator2 = GeneratorDummy('Gen2')
     exampleHead.addGenerator(exampleGenerator1)
     exampleHead.addGenerator(exampleGenerator2)
 
-    exampleConnection = ConnectionSimple(exampleGenerator1, exampleGenerator2)
+    exampleConnection = ConnectionDummy('Con', exampleGenerator1, exampleGenerator2)
     exampleHead.addConnection(exampleConnection)
-
-    exampleStimulus = GeneratorStimulusActivationZeroing()
-    exampleHead.addGenerator(exampleStimulus)
-
-    exampleStimulusToGeneratorConnection = ConnectionSimple(exampleStimulus, exampleGenerator1)
-    exampleGeneratorToStimulusConnection = ConnectionSimple(exampleGenerator1, exampleStimulus)
-    exampleHead.addConnection(exampleStimulusToGeneratorConnection)
-    exampleHead.addConnection(exampleGeneratorToStimulusConnection)
-
+    
     exampleExperiment = Experiment(exampleHead.runSimulation( 1 ))
     print exampleExperiment.getRecording()
-elif userChoice == 2:
-    exampleExperiment = Experiment()
-    exampleExperiment.addStimulusTime( 0.2341 )
-
-    exampleHead = Head()
-    exampleHead.setSamplingFrequency( 10 )
-    exampleHead.addRegistrationSite([0, 0, 0])
-
-    exampleGenerator1 = GeneratorSine()
-    exampleHead.addGenerator(exampleGenerator1)
-
-    exampleStimulus = GeneratorStimulusPhaseReset()
-    exampleStimulus.setStimulusTimes(exampleExperiment.getStimulusTimes())
-    exampleHead.addGenerator(exampleStimulus)
-
-    exampleStimulusToGeneratorConnection = ConnectionSimple(exampleStimulus, exampleGenerator1)
-    exampleGeneratorToStimulusConnection = ConnectionSimple(exampleGenerator1, exampleStimulus)
-    exampleHead.addConnection(exampleGeneratorToStimulusConnection)
-    exampleHead.addConnection(exampleStimulusToGeneratorConnection)
-
-    exampleExperiment.setRecording(exampleHead.runSimulation( 1.1 ))
-    print exampleExperiment.getRecording()
+#elif userChoice == 2:
+#    exampleHead = Head()
+#    exampleHead.setSamplingFrequency(32)
+#    exampleHead.addRegistrationSite([0, 0, 0])
+#    exampleHead.addRegistrationSite([0, 0, 0])
+#
+#    exampleGenerator1 = GeneratorDummy()
+#    exampleGenerator2 = GeneratorDummy()
+#    exampleHead.addGenerator(exampleGenerator1)
+#    exampleHead.addGenerator(exampleGenerator2)
+#
+#    exampleConnection = ConnectionSimple(exampleGenerator1, exampleGenerator2)
+#    exampleHead.addConnection(exampleConnection)
+#
+#    exampleStimulus = GeneratorStimulusActivationZeroing()
+#    exampleHead.addGenerator(exampleStimulus)
+#
+#    exampleStimulusToGeneratorConnection = ConnectionSimple(exampleStimulus, exampleGenerator1)
+#    exampleGeneratorToStimulusConnection = ConnectionSimple(exampleGenerator1, exampleStimulus)
+#    exampleHead.addConnection(exampleStimulusToGeneratorConnection)
+#    exampleHead.addConnection(exampleGeneratorToStimulusConnection)
+#
+#    exampleExperiment = Experiment(exampleHead.runSimulation( 1 ))
+#    print exampleExperiment.getRecording()
+#elif userChoice == 2:
+#    exampleExperiment = Experiment()
+#    exampleExperiment.addStimulusTime( 0.2341 )
+#
+#    exampleHead = Head()
+#    exampleHead.setSamplingFrequency( 10 )
+#    exampleHead.addRegistrationSite([0, 0, 0])
+#
+#    exampleGenerator1 = GeneratorSine()
+#    exampleHead.addGenerator(exampleGenerator1)
+#
+#    exampleStimulus = GeneratorStimulusPhaseReset()
+#    exampleStimulus.setStimulusTimes(exampleExperiment.getStimulusTimes())
+#    exampleHead.addGenerator(exampleStimulus)
+#
+#    exampleStimulusToGeneratorConnection = ConnectionSimple(exampleStimulus, exampleGenerator1)
+#    exampleGeneratorToStimulusConnection = ConnectionSimple(exampleGenerator1, exampleStimulus)
+#    exampleHead.addConnection(exampleGeneratorToStimulusConnection)
+#    exampleHead.addConnection(exampleStimulusToGeneratorConnection)
+#
+#    exampleExperiment.setRecording(exampleHead.runSimulation( 1.1 ))
+#    print exampleExperiment.getRecording()
 else:
     print("No such option unfortunately...")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pybrainsim-activity] SF.net SVN: pybrainsim:[40] trunk/src/PyBrainSim.py

[<rg...@us...>]

Revision: 40
          http://pybrainsim.svn.sourceforge.net/pybrainsim/?rev=40&view=rev
Author:   rgoj
Date:     2009-08-02 18:36:19 +0000 (Sun, 02 Aug 2009)

Log Message:
-----------
* Displaying a comment at the end of the simulations, that the recording will be displayed

Modified Paths:
--------------
    trunk/src/PyBrainSim.py

Modified: trunk/src/PyBrainSim.py
===================================================================
--- trunk/src/PyBrainSim.py	2009-08-02 18:35:18 UTC (rev 39)
+++ trunk/src/PyBrainSim.py	2009-08-02 18:36:19 UTC (rev 40)
@@ -61,7 +61,8 @@
     exampleHead.addConnection(exampleConnection)
     
     exampleExperiment = Experiment(exampleHead.runSimulation( 1 ))
-    print exampleExperiment.getRecording()
+    print("\nSimulations resulted in the following recording:")
+    print(exampleExperiment.getRecording())
 #elif userChoice == 2:
 #    exampleHead = Head()
 #    exampleHead.setSamplingFrequency(32)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pybrainsim-activity] SF.net SVN: pybrainsim:[56] trunk/src/PyBrainSim.py

[<rg...@us...>]

Revision: 56
          http://pybrainsim.svn.sourceforge.net/pybrainsim/?rev=56&view=rev
Author:   rgoj
Date:     2009-08-03 11:14:11 +0000 (Mon, 03 Aug 2009)

Log Message:
-----------
* Only existing, rechecked and correct imports are left, the rest is commented out during refactoring.

Modified Paths:
--------------
    trunk/src/PyBrainSim.py

Modified: trunk/src/PyBrainSim.py
===================================================================
--- trunk/src/PyBrainSim.py	2009-08-03 11:06:58 UTC (rev 55)
+++ trunk/src/PyBrainSim.py	2009-08-03 11:14:11 UTC (rev 56)
@@ -30,11 +30,13 @@
 from Experiment import Experiment
 
 from GeneratorDummy import GeneratorDummy
+from GeneratorNumberIncrementing import GeneratorNumberIncrementing
+from Connection import Connection
 from ConnectionDummy import ConnectionDummy
 
-from GeneratorSine import GeneratorSine
-from GeneratorStimulusActivationZeroing import GeneratorStimulusActivationZeroing 
-from GeneratorStimulusPhaseReset import GeneratorStimulusPhaseReset
+#from GeneratorSine import GeneratorSine
+#from GeneratorStimulusActivationZeroing import GeneratorStimulusActivationZeroing 
+#from GeneratorStimulusPhaseReset import GeneratorStimulusPhaseReset
 
 welcomeMessage = "\n\
 Welcome to this early version of PyBrainSim\n\n\


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pybrainsim-activity] SF.net SVN: pybrainsim:[58] trunk/src/PyBrainSim.py

[<rg...@us...>]

Revision: 58
          http://pybrainsim.svn.sourceforge.net/pybrainsim/?rev=58&view=rev
Author:   rgoj
Date:     2009-08-03 11:21:36 +0000 (Mon, 03 Aug 2009)

Log Message:
-----------
* Generators are now added to the Head object during generator initialization, no need for a separate call to Head.addGenerator(generator)

Modified Paths:
--------------
    trunk/src/PyBrainSim.py

Modified: trunk/src/PyBrainSim.py
===================================================================
--- trunk/src/PyBrainSim.py	2009-08-03 11:20:21 UTC (rev 57)
+++ trunk/src/PyBrainSim.py	2009-08-03 11:21:36 UTC (rev 58)
@@ -54,10 +54,8 @@
     exampleHead.setSamplingFrequency(10)
     exampleHead.addRegistrationSite([0, 0, 0])
 
-    exampleGenerator1 = GeneratorDummy('Gen1')
-    exampleGenerator2 = GeneratorDummy('Gen2')
-    exampleHead.addGenerator(exampleGenerator1)
-    exampleHead.addGenerator(exampleGenerator2)
+    exampleGenerator1 = GeneratorDummy('Gen1', exampleHead)
+    exampleGenerator2 = GeneratorDummy('Gen2', exampleHead)
 
     exampleConnection = ConnectionDummy('Con', exampleGenerator1, exampleGenerator2)
     exampleHead.addConnection(exampleConnection)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pybrainsim-activity] SF.net SVN: pybrainsim:[60] trunk/src/PyBrainSim.py

[<rg...@us...>]

Revision: 60
          http://pybrainsim.svn.sourceforge.net/pybrainsim/?rev=60&view=rev
Author:   rgoj
Date:     2009-08-03 11:27:10 +0000 (Mon, 03 Aug 2009)

Log Message:
-----------
* No need for a separate call to addConnection, removing it, because it is now implemented in the init method of the Connection class.

Modified Paths:
--------------
    trunk/src/PyBrainSim.py

Modified: trunk/src/PyBrainSim.py
===================================================================
--- trunk/src/PyBrainSim.py	2009-08-03 11:24:07 UTC (rev 59)
+++ trunk/src/PyBrainSim.py	2009-08-03 11:27:10 UTC (rev 60)
@@ -56,9 +56,7 @@
 
     exampleGenerator1 = GeneratorDummy('Gen1', exampleHead)
     exampleGenerator2 = GeneratorDummy('Gen2', exampleHead)
-
-    exampleConnection = ConnectionDummy('Con', exampleGenerator1, exampleGenerator2)
-    exampleHead.addConnection(exampleConnection)
+    exampleConnection = ConnectionDummy('Con', exampleHead, exampleGenerator1, exampleGenerator2)
     
     exampleExperiment = Experiment(exampleHead.runSimulation( 1 ))
     print("\nSimulations resulted in the following recording:")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pybrainsim-activity] SF.net SVN: pybrainsim:[62] trunk/src/PyBrainSim.py

[<rg...@us...>]

Revision: 62
          http://pybrainsim.svn.sourceforge.net/pybrainsim/?rev=62&view=rev
Author:   rgoj
Date:     2009-08-03 11:39:06 +0000 (Mon, 03 Aug 2009)

Log Message:
-----------
* Adding a Stimulus object to the first dummy example simulation in PyBrainSim.py

Modified Paths:
--------------
    trunk/src/PyBrainSim.py

Modified: trunk/src/PyBrainSim.py
===================================================================
--- trunk/src/PyBrainSim.py	2009-08-03 11:37:53 UTC (rev 61)
+++ trunk/src/PyBrainSim.py	2009-08-03 11:39:06 UTC (rev 62)
@@ -29,14 +29,13 @@
 from Head import Head
 from Experiment import Experiment
 
+from Stimulus import Stimulus
 from GeneratorDummy import GeneratorDummy
 from GeneratorNumberIncrementing import GeneratorNumberIncrementing
 from Connection import Connection
 from ConnectionDummy import ConnectionDummy
 
 #from GeneratorSine import GeneratorSine
-#from GeneratorStimulusActivationZeroing import GeneratorStimulusActivationZeroing 
-#from GeneratorStimulusPhaseReset import GeneratorStimulusPhaseReset
 
 welcomeMessage = "\n\
 Welcome to this early version of PyBrainSim\n\n\
@@ -54,9 +53,9 @@
     exampleHead.setSamplingFrequency(10)
     exampleHead.addRegistrationSite([0, 0, 0])
 
-    exampleGenerator1 = GeneratorDummy('Gen1', exampleHead)
-    exampleGenerator2 = GeneratorDummy('Gen2', exampleHead)
-    exampleConnection = ConnectionDummy('Con', exampleHead, exampleGenerator1, exampleGenerator2)
+    exampleStimulus = Stimulus('Stim', exampleHead)
+    exampleGenerator = GeneratorDummy('Gen', exampleHead)
+    exampleConnection = ConnectionDummy('Con', exampleHead, exampleStimulus, exampleGenerator)
     
     exampleExperiment = Experiment(exampleHead.runSimulation( 1 ))
     print("\nSimulations resulted in the following recording:")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pybrainsim-activity] SF.net SVN: pybrainsim:[65] trunk/src/PyBrainSim.py

[<rg...@us...>]

Revision: 65
          http://pybrainsim.svn.sourceforge.net/pybrainsim/?rev=65&view=rev
Author:   rgoj
Date:     2009-08-03 11:59:41 +0000 (Mon, 03 Aug 2009)

Log Message:
-----------
* Using StimulusDummy instead of Stimulus for the first example.

Modified Paths:
--------------
    trunk/src/PyBrainSim.py

Modified: trunk/src/PyBrainSim.py
===================================================================
--- trunk/src/PyBrainSim.py	2009-08-03 11:58:42 UTC (rev 64)
+++ trunk/src/PyBrainSim.py	2009-08-03 11:59:41 UTC (rev 65)
@@ -29,7 +29,7 @@
 from Head import Head
 from Experiment import Experiment
 
-from Stimulus import Stimulus
+from StimulusDummy import StimulusDummy
 from GeneratorDummy import GeneratorDummy
 from GeneratorNumberIncrementing import GeneratorNumberIncrementing
 from Connection import Connection
@@ -53,7 +53,7 @@
     exampleHead.setSamplingFrequency(10)
     exampleHead.addRegistrationSite([0, 0, 0])
 
-    exampleStimulus = Stimulus('Stim', exampleHead)
+    exampleStimulus = StimulusDummy('Stim', exampleHead)
     exampleGenerator = GeneratorDummy('Gen', exampleHead)
     exampleConnection = ConnectionDummy('Con', exampleHead, exampleStimulus, exampleGenerator)
     


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pybrainsim-activity] SF.net SVN: pybrainsim:[70] trunk/src/PyBrainSim.py

[<rg...@us...>]

Revision: 70
          http://pybrainsim.svn.sourceforge.net/pybrainsim/?rev=70&view=rev
Author:   rgoj
Date:     2009-08-03 17:05:30 +0000 (Mon, 03 Aug 2009)

Log Message:
-----------
* Re-adding a second example simulation to the PyBrainSim.py script - using one number incrementing generator with a stimulus

Modified Paths:
--------------
    trunk/src/PyBrainSim.py

Modified: trunk/src/PyBrainSim.py
===================================================================
--- trunk/src/PyBrainSim.py	2009-08-03 17:04:08 UTC (rev 69)
+++ trunk/src/PyBrainSim.py	2009-08-03 17:05:30 UTC (rev 70)
@@ -29,6 +29,7 @@
 from Head import Head
 from Experiment import Experiment
 
+from Stimulus import Stimulus
 from StimulusDummy import StimulusDummy
 from GeneratorDummy import GeneratorDummy
 from GeneratorNumberIncrementing import GeneratorNumberIncrementing
@@ -41,7 +42,7 @@
 Welcome to this early version of PyBrainSim\n\n\
 Choose the type of simulation you would like to perform:\n\
     1. Example dummy simulation\n\
-    2. Adding numbers\n\
+    2. Incrementing numbers, one generator and a stimulus\n\
     3. Sinusoidal generator\n"
 
 print(welcomeMessage)
@@ -60,31 +61,20 @@
     exampleExperiment = Experiment(exampleHead.runSimulation( 1 ))
     print("\nSimulations resulted in the following recording:")
     print(exampleExperiment.getRecording())
+elif userChoice == 2:
+    exampleHead = Head()
+    exampleHead.setSamplingFrequency(10)
+    exampleHead.addRegistrationSite([0, 0, 0])
+
+    exampleStimulus = Stimulus('Stim', exampleHead)
+    exampleStimulus.setStimulusTimes([0.3, 0.6])
+    exampleGenerator = GeneratorNumberIncrementing('Gen', exampleHead)
+    exampleConnection = Connection('Con', exampleHead, exampleStimulus, exampleGenerator)
+
+    exampleExperiment = Experiment(exampleHead.runSimulation( 1 ))
+    print("\nSimulations resulted in the following recording:")
+    print exampleExperiment.getRecording()
 #elif userChoice == 2:
-#    exampleHead = Head()
-#    exampleHead.setSamplingFrequency(32)
-#    exampleHead.addRegistrationSite([0, 0, 0])
-#    exampleHead.addRegistrationSite([0, 0, 0])
-#
-#    exampleGenerator1 = GeneratorDummy()
-#    exampleGenerator2 = GeneratorDummy()
-#    exampleHead.addGenerator(exampleGenerator1)
-#    exampleHead.addGenerator(exampleGenerator2)
-#
-#    exampleConnection = ConnectionSimple(exampleGenerator1, exampleGenerator2)
-#    exampleHead.addConnection(exampleConnection)
-#
-#    exampleStimulus = GeneratorStimulusActivationZeroing()
-#    exampleHead.addGenerator(exampleStimulus)
-#
-#    exampleStimulusToGeneratorConnection = ConnectionSimple(exampleStimulus, exampleGenerator1)
-#    exampleGeneratorToStimulusConnection = ConnectionSimple(exampleGenerator1, exampleStimulus)
-#    exampleHead.addConnection(exampleStimulusToGeneratorConnection)
-#    exampleHead.addConnection(exampleGeneratorToStimulusConnection)
-#
-#    exampleExperiment = Experiment(exampleHead.runSimulation( 1 ))
-#    print exampleExperiment.getRecording()
-#elif userChoice == 2:
 #    exampleExperiment = Experiment()
 #    exampleExperiment.addStimulusTime( 0.2341 )
 #


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pybrainsim-activity] SF.net SVN: pybrainsim:[71] trunk/src/PyBrainSim.py

[<rg...@us...>]

Revision: 71
          http://pybrainsim.svn.sourceforge.net/pybrainsim/?rev=71&view=rev
Author:   rgoj
Date:     2009-08-03 17:27:14 +0000 (Mon, 03 Aug 2009)

Log Message:
-----------
* Adding another example simulation with two generators and one stimulus for each generator

Modified Paths:
--------------
    trunk/src/PyBrainSim.py

Modified: trunk/src/PyBrainSim.py
===================================================================
--- trunk/src/PyBrainSim.py	2009-08-03 17:05:30 UTC (rev 70)
+++ trunk/src/PyBrainSim.py	2009-08-03 17:27:14 UTC (rev 71)
@@ -43,7 +43,8 @@
 Choose the type of simulation you would like to perform:\n\
     1. Example dummy simulation\n\
     2. Incrementing numbers, one generator and a stimulus\n\
-    3. Sinusoidal generator\n"
+    3. Incrementing numbers, two generators and a stimulus for one of them\n\
+    4. Sinusoidal generator\n"
 
 print(welcomeMessage)
 userChoice = input("Your choice: ")
@@ -74,6 +75,23 @@
     exampleExperiment = Experiment(exampleHead.runSimulation( 1 ))
     print("\nSimulations resulted in the following recording:")
     print exampleExperiment.getRecording()
+elif userChoice == 3:
+    exampleHead = Head()
+    exampleHead.setSamplingFrequency(10)
+    exampleHead.addRegistrationSite([0, 0, 0])
+
+    exampleStimulus1 = Stimulus('Stim1', exampleHead)
+    exampleStimulus2 = Stimulus('Stim2', exampleHead)
+    exampleStimulus1.setStimulusTimes([0.3, 0.6])
+    exampleStimulus2.setStimulusTimes([0.5])
+    exampleGenerator1 = GeneratorNumberIncrementing('Gen1', exampleHead)
+    exampleGenerator2 = GeneratorNumberIncrementing('Gen2', exampleHead)
+    exampleConnection1 = Connection('Con1', exampleHead, exampleStimulus1, exampleGenerator1)
+    exampleConnection2 = Connection('Con2', exampleHead, exampleStimulus2, exampleGenerator2)
+
+    exampleExperiment = Experiment(exampleHead.runSimulation( 1 ))
+    print("\nSimulations resulted in the following recording:")
+    print exampleExperiment.getRecording()
 #elif userChoice == 2:
 #    exampleExperiment = Experiment()
 #    exampleExperiment.addStimulusTime( 0.2341 )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pybrainsim-activity] SF.net SVN: pybrainsim:[80] trunk/src/PyBrainSim.py

[<rg...@us...>]

Revision: 80
          http://pybrainsim.svn.sourceforge.net/pybrainsim/?rev=80&view=rev
Author:   rgoj
Date:     2009-08-05 07:14:20 +0000 (Wed, 05 Aug 2009)

Log Message:
-----------
* Example 3 now also shows how the Experiment class can be used to keep track of stimulus times for two separate stimulus objects. This is more of a hack for now, but should take more shape later.

Modified Paths:
--------------
    trunk/src/PyBrainSim.py

Modified: trunk/src/PyBrainSim.py
===================================================================
--- trunk/src/PyBrainSim.py	2009-08-05 06:58:57 UTC (rev 79)
+++ trunk/src/PyBrainSim.py	2009-08-05 07:14:20 UTC (rev 80)
@@ -78,16 +78,20 @@
     exampleHead.setSamplingFrequency(10)
     exampleHead.addRegistrationSite([0, 0, 0])
 
+    exampleExperiment = Experiment()
+    exampleExperiment.setStimulusTimes([[0.3, 0.6], [0.5]])
+
     exampleStimulus1 = Stimulus('Stim1', exampleHead)
     exampleStimulus2 = Stimulus('Stim2', exampleHead)
-    exampleStimulus1.setStimulusTimes([0.3, 0.6])
-    exampleStimulus2.setStimulusTimes([0.5])
+    exampleStimulus1.setStimulusTimes(exampleExperiment.getStimulusTimes()[0])
+    exampleStimulus2.setStimulusTimes(exampleExperiment.getStimulusTimes()[1])
+
     exampleGenerator1 = GeneratorNumberIncrementing('Gen1', exampleHead)
     exampleGenerator2 = GeneratorNumberIncrementing('Gen2', exampleHead)
     exampleConnection1 = Connection('Con1', exampleHead, exampleStimulus1, exampleGenerator1)
     exampleConnection2 = Connection('Con2', exampleHead, exampleStimulus2, exampleGenerator2)
 
-    exampleExperiment = Experiment(exampleHead.runSimulation( 1 ))
+    exampleExperiment.setRecording(exampleHead.runSimulation( 1 ))
     print("\nSimulations resulted in the following recording:")
     print exampleExperiment.getRecording()
 elif userChoice == 4:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pybrainsim-activity] SF.net SVN: pybrainsim:[83] trunk/src/PyBrainSim.py

[<rg...@us...>]

Revision: 83
          http://pybrainsim.svn.sourceforge.net/pybrainsim/?rev=83&view=rev
Author:   rgoj
Date:     2009-08-05 10:06:51 +0000 (Wed, 05 Aug 2009)

Log Message:
-----------
* All examples in PyBrainSim.py updated to use the new Experiment class

Modified Paths:
--------------
    trunk/src/PyBrainSim.py

Modified: trunk/src/PyBrainSim.py
===================================================================
--- trunk/src/PyBrainSim.py	2009-08-05 10:03:30 UTC (rev 82)
+++ trunk/src/PyBrainSim.py	2009-08-05 10:06:51 UTC (rev 83)
@@ -57,7 +57,7 @@
     exampleGenerator = GeneratorDummy('Gen', exampleHead)
     exampleConnection = ConnectionDummy('Con', exampleHead, exampleStimulus, exampleGenerator)
     
-    exampleExperiment = Experiment(exampleHead.runSimulation( 1 ))
+    exampleExperiment = Experiment(exampleHead.getSamplingFrequency(), 1.0, exampleHead.runSimulation( 1.0 ))
     print("\nSimulations resulted in the following recording:")
     print(exampleExperiment.getRecording())
 elif userChoice == 2:
@@ -70,7 +70,7 @@
     exampleGenerator = GeneratorNumberIncrementing('Gen', exampleHead)
     exampleConnection = Connection('Con', exampleHead, exampleStimulus, exampleGenerator)
 
-    exampleExperiment = Experiment(exampleHead.runSimulation( 1 ))
+    exampleExperiment = Experiment(exampleHead.getSamplingFrequency(), 1.0, exampleHead.runSimulation( 1.0 ))
     print("\nSimulations resulted in the following recording:")
     print exampleExperiment.getRecording()
 elif userChoice == 3:
@@ -78,7 +78,7 @@
     exampleHead.setSamplingFrequency(10)
     exampleHead.addRegistrationSite([0, 0, 0])
 
-    exampleExperiment = Experiment()
+    exampleExperiment = Experiment(exampleHead.getSamplingFrequency(), 1.0)
     exampleExperiment.setStimulusTimes([[0.3, 0.6], [0.5]])
 
     exampleStimulus1 = Stimulus('Stim1', exampleHead)
@@ -91,7 +91,7 @@
     exampleConnection1 = Connection('Con1', exampleHead, exampleStimulus1, exampleGenerator1)
     exampleConnection2 = Connection('Con2', exampleHead, exampleStimulus2, exampleGenerator2)
 
-    exampleExperiment.setRecording(exampleHead.runSimulation( 1 ))
+    exampleExperiment.setRecording(exampleHead.runSimulation())
     print("\nSimulations resulted in the following recording:")
     print exampleExperiment.getRecording()
 elif userChoice == 4:
@@ -107,7 +107,6 @@
     exampleExperiment = Experiment(exampleHead.getSamplingFrequency(), 1.0, exampleHead.runSimulation( 1.0 ))
     print("\nSimulations resulted in the following recording:")
     print exampleExperiment.getRecording()
-
     exampleExperiment.plotRecording()
 else:
     print("No such option unfortunately...")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pybrainsim-activity] SF.net SVN: pybrainsim:[85] trunk/src/PyBrainSim.py

[<rg...@us...>]

Revision: 85
          http://pybrainsim.svn.sourceforge.net/pybrainsim/?rev=85&view=rev
Author:   rgoj
Date:     2009-08-05 11:54:07 +0000 (Wed, 05 Aug 2009)

Log Message:
-----------
* The fourth example now also uses the Experiment class to set the stimulus times

Modified Paths:
--------------
    trunk/src/PyBrainSim.py

Modified: trunk/src/PyBrainSim.py
===================================================================
--- trunk/src/PyBrainSim.py	2009-08-05 10:23:11 UTC (rev 84)
+++ trunk/src/PyBrainSim.py	2009-08-05 11:54:07 UTC (rev 85)
@@ -98,13 +98,17 @@
     exampleHead = Head()
     exampleHead.setSamplingFrequency(128)
     exampleHead.addRegistrationSite([0, 0, 0])
+    
+    exampleExperiment = Experiment(exampleHead.getSamplingFrequency(), 1.0)
+    exampleExperiment.setStimulusTimes([[0.3, 0.6]])
 
     exampleStimulus = Stimulus('Stim', exampleHead)
-    exampleStimulus.setStimulusTimes([0.3, 0.6])
+    print exampleExperiment.getStimulusTimes()[0]
+    exampleStimulus.setStimulusTimes(exampleExperiment.getStimulusTimes()[0])
     exampleGenerator = GeneratorSine('Gen', exampleHead)
     exampleConnection = Connection('Con', exampleHead, exampleStimulus, exampleGenerator)
 
-    exampleExperiment = Experiment(exampleHead.getSamplingFrequency(), 1.0, exampleHead.runSimulation( 1.0 ))
+    exampleExperiment.setRecording(exampleHead.runSimulation())
     print("\nSimulations resulted in the following recording:")
     print exampleExperiment.getRecording()
     exampleExperiment.plotRecording()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pybrainsim-activity] SF.net SVN: pybrainsim:[87] trunk/src/PyBrainSim.py

[<rg...@us...>]

Revision: 87
          http://pybrainsim.svn.sourceforge.net/pybrainsim/?rev=87&view=rev
Author:   rgoj
Date:     2009-08-05 13:01:36 +0000 (Wed, 05 Aug 2009)

Log Message:
-----------
* Added more stimulus times for fourth example simulation
* In example 3 and 4 the simulation is now correctly run with the duration specified in the Experiment class object

Modified Paths:
--------------
    trunk/src/PyBrainSim.py

Modified: trunk/src/PyBrainSim.py
===================================================================
--- trunk/src/PyBrainSim.py	2009-08-05 11:59:20 UTC (rev 86)
+++ trunk/src/PyBrainSim.py	2009-08-05 13:01:36 UTC (rev 87)
@@ -91,7 +91,7 @@
     exampleConnection1 = Connection('Con1', exampleHead, exampleStimulus1, exampleGenerator1)
     exampleConnection2 = Connection('Con2', exampleHead, exampleStimulus2, exampleGenerator2)
 
-    exampleExperiment.setRecording(exampleHead.runSimulation())
+    exampleExperiment.setRecording(exampleHead.runSimulation(exampleExperiment.getDuration()))
     print("\nSimulations resulted in the following recording:")
     print exampleExperiment.getRecording()
 elif userChoice == 4:
@@ -99,8 +99,8 @@
     exampleHead.setSamplingFrequency(128)
     exampleHead.addRegistrationSite([0, 0, 0])
     
-    exampleExperiment = Experiment(exampleHead.getSamplingFrequency(), 1.0)
-    exampleExperiment.setStimulusTimes([[0.3, 0.6]])
+    exampleExperiment = Experiment(exampleHead.getSamplingFrequency(), 10.0)
+    exampleExperiment.setStimulusTimes([[0.3, 1.75, 2.16, 3.87, 4.31, 5.183, 6.34, 7.13]])
 
     exampleStimulus = Stimulus('Stim', exampleHead)
     print exampleExperiment.getStimulusTimes()[0]
@@ -108,7 +108,7 @@
     exampleGenerator = GeneratorSine('Gen', exampleHead)
     exampleConnection = Connection('Con', exampleHead, exampleStimulus, exampleGenerator)
 
-    exampleExperiment.setRecording(exampleHead.runSimulation())
+    exampleExperiment.setRecording(exampleHead.runSimulation(exampleExperiment.getDuration()))
     print("\nSimulations resulted in the following recording:")
     print exampleExperiment.getRecording()
     exampleExperiment.plotRecording()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pybrainsim-activity] SF.net SVN: pybrainsim:[97] trunk/src/PyBrainSim.py

[<rg...@us...>]

Revision: 97
          http://pybrainsim.svn.sourceforge.net/pybrainsim/?rev=97&view=rev
Author:   rgoj
Date:     2009-08-07 10:39:26 +0000 (Fri, 07 Aug 2009)

Log Message:
-----------
* Added a fifth simulation example to the PyBrainSim.py script, with a hundred generators of random frequency and initial phase, some connected to a stimulus. This gives very nice results in the form of an ongoing signal that looks very similar to EEG and an ERP that has some nice peaks, and completes a milestone!

Modified Paths:
--------------
    trunk/src/PyBrainSim.py

Modified: trunk/src/PyBrainSim.py
===================================================================
--- trunk/src/PyBrainSim.py	2009-08-07 10:21:20 UTC (rev 96)
+++ trunk/src/PyBrainSim.py	2009-08-07 10:39:26 UTC (rev 97)
@@ -26,6 +26,8 @@
 pybrainsim.sourceforge.net
 """
 
+from random import random
+
 from Head import Head
 from Experiment import Experiment
 from Stimulus import Stimulus
@@ -42,7 +44,9 @@
     1. Example dummy simulation\n\
     2. Incrementing numbers, one generator and a stimulus\n\
     3. Incrementing numbers, two generators and a stimulus for one of them\n\
-    4. Sinusoidal generator\n"
+    4. A single sinusoidal generator\n\
+    5. A hundred sinusoidal generators with random frequencies, some connected\
+ to a stimulus.\n"
 
 print(welcomeMessage)
 userChoice = input("Your choice: ")
@@ -112,5 +116,32 @@
     print("\nSimulations resulted in the following recording:")
     print exampleExperiment.getRecording()
     exampleExperiment.plotRecording()
+elif userChoice == 5:
+    exampleHead = Head()
+    exampleHead.setSamplingFrequency(256)
+    exampleHead.addRegistrationSite([0, 0, 0])
+    exampleExperiment = Experiment(exampleHead.getSamplingFrequency(), 100.0)
+    
+    # Randomizing stimuli times
+    stimuli = []
+    for i in range(100):
+        stimuli.append( i + 0.2 +random()/2 )
+    exampleExperiment.setStimulusTimes([stimuli])
+    exampleStimulus = Stimulus('Stim', exampleHead)
+    exampleStimulus.setStimulusTimes(exampleExperiment.getStimulusTimes()[0])
+
+    # Creating many generators with random frequencies in the range 2-20 Hz and
+    # random phases. Connecting some of them to the stimulus generator
+    exampleGenerators = []
+    exampleConnections = []
+    for i in range(100):
+        frequency = 2.0 + random() * 18
+        phaseShift = random()
+        exampleGenerators.append(GeneratorSine('Gen', exampleHead, frequency, phaseShift))
+        if(random() > 0.75):
+            exampleConnections.append(Connection('Con', exampleHead, exampleStimulus, exampleGenerators[i]))
+
+    exampleExperiment.setRecording(exampleHead.runSimulation(exampleExperiment.getDuration()))
+    exampleExperiment.plotRecording()
 else:
     print("No such option unfortunately...")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pybrainsim-activity] SF.net SVN: pybrainsim:[101] trunk/src/PyBrainSim.py

[<rg...@us...>]

Revision: 101
          http://pybrainsim.svn.sourceforge.net/pybrainsim/?rev=101&view=rev
Author:   rgoj
Date:     2009-08-13 09:14:46 +0000 (Thu, 13 Aug 2009)

Log Message:
-----------
* Using the HeadModel in the PyBrainSim.py examples - creating a HeadModel object in each example

Modified Paths:
--------------
    trunk/src/PyBrainSim.py

Modified: trunk/src/PyBrainSim.py
===================================================================
--- trunk/src/PyBrainSim.py	2009-08-13 09:04:53 UTC (rev 100)
+++ trunk/src/PyBrainSim.py	2009-08-13 09:14:46 UTC (rev 101)
@@ -29,6 +29,7 @@
 from random import random
 
 from Head import Head
+from HeadModel import HeadModel
 from Experiment import Experiment
 from Stimulus import Stimulus
 from StimulusDummy import StimulusDummy
@@ -54,6 +55,7 @@
 
 if userChoice == 1:
     exampleHead = Head()
+    exampleHeadModel = HeadModel(exampleHead)
     exampleHead.setSamplingFrequency(10)
     exampleHead.addRegistrationSite([0, 0, 0])
 
@@ -66,6 +68,7 @@
     print(exampleExperiment.getRecording())
 elif userChoice == 2:
     exampleHead = Head()
+    exampleHeadModel = HeadModel(exampleHead)
     exampleHead.setSamplingFrequency(10)
     exampleHead.addRegistrationSite([0, 0, 0])
 
@@ -79,6 +82,7 @@
     print exampleExperiment.getRecording()
 elif userChoice == 3:
     exampleHead = Head()
+    exampleHeadModel = HeadModel(exampleHead)
     exampleHead.setSamplingFrequency(10)
     exampleHead.addRegistrationSite([0, 0, 0])
 
@@ -100,6 +104,7 @@
     print exampleExperiment.getRecording()
 elif userChoice == 4:
     exampleHead = Head()
+    exampleHeadModel = HeadModel(exampleHead)
     exampleHead.setSamplingFrequency(128)
     exampleHead.addRegistrationSite([0, 0, 0])
     
@@ -118,6 +123,7 @@
     exampleExperiment.plotRecording()
 elif userChoice == 5:
     exampleHead = Head()
+    exampleHeadModel = HeadModel(exampleHead)
     exampleHead.setSamplingFrequency(256)
     exampleHead.addRegistrationSite([0, 0, 0])
     exampleExperiment = Experiment(exampleHead.getSamplingFrequency(), 100.0)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pybrainsim-activity] SF.net SVN: pybrainsim:[104] trunk/src/PyBrainSim.py

[<rg...@us...>]

Revision: 104
          http://pybrainsim.svn.sourceforge.net/pybrainsim/?rev=104&view=rev
Author:   rgoj
Date:     2009-08-14 12:50:53 +0000 (Fri, 14 Aug 2009)

Log Message:
-----------
* Added a sixth example to PyBrainSim.py that for now replicates a singe sine generator example, but will soon be changed to showcase multi-recording-site functionality.

Modified Paths:
--------------
    trunk/src/PyBrainSim.py

Modified: trunk/src/PyBrainSim.py
===================================================================
--- trunk/src/PyBrainSim.py	2009-08-13 17:20:12 UTC (rev 103)
+++ trunk/src/PyBrainSim.py	2009-08-14 12:50:53 UTC (rev 104)
@@ -30,6 +30,7 @@
 
 from Head import Head
 from HeadModel import HeadModel
+from HeadModelHalfSphere import HeadModelHalfSphere
 from Experiment import Experiment
 from Stimulus import Stimulus
 from StimulusDummy import StimulusDummy
@@ -47,7 +48,8 @@
     3. Incrementing numbers, two generators and a stimulus for one of them\n\
     4. A single sinusoidal generator\n\
     5. A hundred sinusoidal generators with random frequencies, some connected\
- to a stimulus.\n"
+ to a stimulus.\n\
+    6. A single sinusoidal generator but with two registration sites"
 
 print(welcomeMessage)
 userChoice = input("Your choice: ")
@@ -149,5 +151,24 @@
 
     exampleExperiment.setRecording(exampleHead.runSimulation(exampleExperiment.getDuration()))
     exampleExperiment.plotRecording()
+elif userChoice == 6:
+    exampleHead = Head()
+    exampleHeadModel = HeadModelHalfSphere(exampleHead)
+    exampleHead.setSamplingFrequency(128)
+    exampleHead.addRegistrationSite([0.5, 0, 0.866])
+    
+    exampleExperiment = Experiment(exampleHead.getSamplingFrequency(), 10.0)
+    exampleExperiment.setStimulusTimes([[0.3, 1.75, 2.16, 3.87, 4.31, 5.183, 6.34, 7.13]])
+
+    exampleStimulus = Stimulus('Stim', exampleHead)
+    print exampleExperiment.getStimulusTimes()[0]
+    exampleStimulus.setStimulusTimes(exampleExperiment.getStimulusTimes()[0])
+    exampleGenerator = GeneratorSine('Gen', exampleHead)
+    exampleConnection = Connection('Con', exampleHead, exampleStimulus, exampleGenerator)
+
+    exampleExperiment.setRecording(exampleHead.runSimulation(exampleExperiment.getDuration()))
+    print("\nSimulations resulted in the following recording:")
+    print exampleExperiment.getRecording()
+    exampleExperiment.plotRecording()
 else:
     print("No such option unfortunately...")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pybrainsim-activity] SF.net SVN: pybrainsim:[105] trunk/src/PyBrainSim.py

[<rg...@us...>]

Revision: 105
          http://pybrainsim.svn.sourceforge.net/pybrainsim/?rev=105&view=rev
Author:   rgoj
Date:     2009-08-14 12:56:59 +0000 (Fri, 14 Aug 2009)

Log Message:
-----------
* The sixth example now has two registration sites on the opposite sides of the half-shpere

Modified Paths:
--------------
    trunk/src/PyBrainSim.py

Modified: trunk/src/PyBrainSim.py
===================================================================
--- trunk/src/PyBrainSim.py	2009-08-14 12:50:53 UTC (rev 104)
+++ trunk/src/PyBrainSim.py	2009-08-14 12:56:59 UTC (rev 105)
@@ -156,6 +156,7 @@
     exampleHeadModel = HeadModelHalfSphere(exampleHead)
     exampleHead.setSamplingFrequency(128)
     exampleHead.addRegistrationSite([0.5, 0, 0.866])
+    exampleHead.addRegistrationSite([-0.5, 0, 0.866])
     
     exampleExperiment = Experiment(exampleHead.getSamplingFrequency(), 10.0)
     exampleExperiment.setStimulusTimes([[0.3, 1.75, 2.16, 3.87, 4.31, 5.183, 6.34, 7.13]])
@@ -167,8 +168,6 @@
     exampleConnection = Connection('Con', exampleHead, exampleStimulus, exampleGenerator)
 
     exampleExperiment.setRecording(exampleHead.runSimulation(exampleExperiment.getDuration()))
-    print("\nSimulations resulted in the following recording:")
-    print exampleExperiment.getRecording()
     exampleExperiment.plotRecording()
 else:
     print("No such option unfortunately...")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pybrainsim-activity] SF.net SVN: pybrainsim:[108] trunk/src/PyBrainSim.py

[<rg...@us...>]

Revision: 108
          http://pybrainsim.svn.sourceforge.net/pybrainsim/?rev=108&view=rev
Author:   rgoj
Date:     2009-08-15 11:15:50 +0000 (Sat, 15 Aug 2009)

Log Message:
-----------
* Removed a print command left over from some testing

Modified Paths:
--------------
    trunk/src/PyBrainSim.py

Modified: trunk/src/PyBrainSim.py
===================================================================
--- trunk/src/PyBrainSim.py	2009-08-15 11:14:34 UTC (rev 107)
+++ trunk/src/PyBrainSim.py	2009-08-15 11:15:50 UTC (rev 108)
@@ -162,7 +162,6 @@
     exampleExperiment.setStimulusTimes([[0.3, 1.75, 2.16, 3.87, 4.31, 5.183, 6.34, 7.13]])
 
     exampleStimulus = Stimulus('Stim', exampleHead)
-    print exampleExperiment.getStimulusTimes()[0]
     exampleStimulus.setStimulusTimes(exampleExperiment.getStimulusTimes()[0])
     exampleGenerator = GeneratorSine('Gen', exampleHead)
     exampleConnection = Connection('Con', exampleHead, exampleStimulus, exampleGenerator)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pybrainsim-activity] SF.net SVN: pybrainsim:[117] trunk/src/PyBrainSim.py

[<rg...@us...>]

Revision: 117
          http://pybrainsim.svn.sourceforge.net/pybrainsim/?rev=117&view=rev
Author:   rgoj
Date:     2009-08-15 16:04:26 +0000 (Sat, 15 Aug 2009)

Log Message:
-----------
* Changed the example for HeadModelHalfSphere to show off that activity is now recorded differently depending on distance between recording site and generator

Modified Paths:
--------------
    trunk/src/PyBrainSim.py

Modified: trunk/src/PyBrainSim.py
===================================================================
--- trunk/src/PyBrainSim.py	2009-08-15 16:02:11 UTC (rev 116)
+++ trunk/src/PyBrainSim.py	2009-08-15 16:04:26 UTC (rev 117)
@@ -163,7 +163,8 @@
 
     exampleStimulus = Stimulus('Stim', exampleHead)
     exampleStimulus.setStimulusTimes(exampleExperiment.getStimulusTimes()[0])
-    exampleGenerator = GeneratorSine('Gen', exampleHead)
+    exampleGenerator = GeneratorSine('Gen', exampleHead, position = [0.5, 0, 0.366], frequency = 7)
+    exampleGenerator = GeneratorSine('Gen', exampleHead, position = [-0.5, 0, 0.366], frequency = 4)
     exampleConnection = Connection('Con', exampleHead, exampleStimulus, exampleGenerator)
 
     exampleExperiment.setRecording(exampleHead.runSimulation(exampleExperiment.getDuration()))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.