[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.