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