|
@@ -1,11 +1,11 @@
|
|
|
-
|
|
|
-
|
|
|
-#include <iostream.h>
|
|
|
+#include "sys.hpp"
|
|
|
+#include "debug.hpp"
|
|
|
+#include <iostream>
|
|
|
#include <math.h>
|
|
|
#include <stdio.h>
|
|
|
#include <stdlib.h>
|
|
|
|
|
|
-#include <libcsim.h>
|
|
|
+#include <objsimlibrary.hpp>
|
|
|
#include <anyoption.h>
|
|
|
#include <valarray>
|
|
|
|
|
@@ -141,18 +141,18 @@ int main(int argc, char** argv)
|
|
|
|
|
|
|
|
|
|
|
|
-// ObjMovie MyMovie("/home/frank/prog/crystal/movies/crystal_all_dirchange.idlmov");
|
|
|
-// ObjMovie MyMovie("/home/frank/prog/crystal/movies/tetraeder02.idlmov");
|
|
|
-// ObjMovie MyMovie("/home/frank/prog/crystal/movies/verticalbar.idlmov");
|
|
|
-// ObjMovie MyMovie("/home/frank/prog/crystal/movies/horizontalbar.idlmov");
|
|
|
-// ObjMovie MyMovie("/home/frank/prog/crystal/movies/twobar_o3.idlmov");
|
|
|
-// ObjMovie MyMovie("/home/frank/prog/crystal/movies/twooris.idlmov");
|
|
|
-// ObjMovie MyMovie("/home/frank/prog/crystal/movies/16oris.idlmov");
|
|
|
-// ObjMovie MyMovie("/home/frank/prog/crystal/movies/16bars.idlmov");
|
|
|
-// ObjMovie MyMovie("/home/frank/prog/crystal/movies/winkel.idlmov");
|
|
|
-// ObjMovie MyMovie("/home/frank/prog/crystal/movies/winkelbars256.idlmov");
|
|
|
-// ObjMovie MyMovie("/home/frank/prog/crystal/movies/winkelbars64.idlmov");
|
|
|
- ObjMovie MyMovie("/home/frank/prog/crystal/movies/winkelbars2.idlmov");
|
|
|
+// ObjMovie MyMovie("../../../movies/crystal_all_dirchange.idlmov");
|
|
|
+// ObjMovie MyMovie("../../../movies/tetraeder02.idlmov");
|
|
|
+// ObjMovie MyMovie("../../../movies/verticalbar.idlmov");
|
|
|
+// ObjMovie MyMovie("../../../movies/horizontalbar.idlmov");
|
|
|
+// ObjMovie MyMovie("../../../movies/twobar_o3.idlmov");
|
|
|
+// ObjMovie MyMovie("../../../movies/twooris.idlmov");
|
|
|
+// ObjMovie MyMovie("../../../movies/16oris.idlmov");
|
|
|
+// ObjMovie MyMovie("../../../movies/16bars.idlmov");
|
|
|
+// ObjMovie MyMovie("../../../movies/winkel.idlmov");
|
|
|
+// ObjMovie MyMovie("../../../data/movies/winkelbars256.idlmov");
|
|
|
+// ObjMovie MyMovie("../../../data/movies/winkelbars64.idlmov");
|
|
|
+ ObjMovie MyMovie("../../../data/movies/winkelbars2.idlmov");
|
|
|
|
|
|
|
|
|
// generate InputLayers
|
|
@@ -219,8 +219,8 @@ int main(int argc, char** argv)
|
|
|
|
|
|
FacilitativeConnection *ConITSelfInh=0;
|
|
|
if (ITSelfInhibitionWeight > 0) {
|
|
|
-// connection *ConITSelfInh = new connection(ITLayer, ITLayer, 1, true); // inputNumber=0
|
|
|
- ConITSelfInh = new FacilitativeConnection(ITLayer, ITLayer, 1, 60, 0.005, 50, 0.01); // inputNumber=0
|
|
|
+// connection *ConITSelfInh = new connection(ITLayer, ITLayer, csimInputChannel_GABAa, true); // inputNumber=0
|
|
|
+ ConITSelfInh = new FacilitativeConnection(ITLayer, ITLayer, csimInputChannel_GABAa, 60, 0.005, 50, 0.01); // inputNumber=0
|
|
|
ConITSelfInh->SetNonSelf(true);
|
|
|
|
|
|
ConITSelfInh->SetName("conIT_SelfInh");
|
|
@@ -259,7 +259,7 @@ int main(int argc, char** argv)
|
|
|
|
|
|
|
|
|
if (ITExCInhWeight > 0) {
|
|
|
- connection *ConITExCInh = new connection(ITLayer, ITCommonInhLayer, 0); // inputNumber=0
|
|
|
+ connection *ConITExCInh = new connection(ITLayer, ITCommonInhLayer, csimInputChannel_AMPA); // inputNumber=0
|
|
|
ConITExCInh->SetName("conIT_ExCInh");
|
|
|
if (LoadITWeights) ConITExCInh->Load();
|
|
|
else {
|
|
@@ -287,7 +287,7 @@ int main(int argc, char** argv)
|
|
|
float FBInhMaxWeights=3;
|
|
|
connection *ConITFbInh =0;
|
|
|
if (ITFBInhWeight > 0) {
|
|
|
- ConITFbInh = new connection(ITCommonInhLayer, BlobInputLayer, 1);
|
|
|
+ ConITFbInh = new connection(ITCommonInhLayer, BlobInputLayer, csimInputChannel_GABAa);
|
|
|
ConITFbInh->SetName("conIT_FBInh");
|
|
|
if (LoadITWeights) ConITFbInh->Load();
|
|
|
else {
|
|
@@ -310,7 +310,7 @@ int main(int argc, char** argv)
|
|
|
}
|
|
|
|
|
|
|
|
|
- connection *ConInpIT = new connection(BlobInputLayer, ITLayer, 0, false);
|
|
|
+ connection *ConInpIT = new connection(BlobInputLayer, ITLayer, csimInputChannel_AMPA, false);
|
|
|
// FacilitativeConnection *ConInpIT = new FacilitativeConnection(BlobInputLayer, ITLayer, 0, 300, 0.003, 50, 0.002);
|
|
|
ConInpIT->SetName("conForward");
|
|
|
if (LoadForwardWeights) ConInpIT->Load();
|
|
@@ -360,7 +360,7 @@ int main(int argc, char** argv)
|
|
|
connection *ConInhInpIT = 0;
|
|
|
if (InitialFWInhWeights>0) {
|
|
|
float InhRossumCp=0.05*InitialFWInhWeights;
|
|
|
- ConInhInpIT = new connection(BlobInputLayer, ITLayer, 1);
|
|
|
+ ConInhInpIT = new connection(BlobInputLayer, ITLayer, csimInputChannel_GABAa);
|
|
|
ConInhInpIT->SetName("conInhForward");
|
|
|
if (LoadForwardWeights) ConInhInpIT->Load();
|
|
|
else {
|
|
@@ -438,7 +438,7 @@ int main(int argc, char** argv)
|
|
|
switch (CurInputType) {
|
|
|
case InpHighOverlap:
|
|
|
{
|
|
|
- PictureSequenceInput* TuneInp = new PictureSequenceInput(BlobInputLayer, 0,istrength, l1inpStimDur, 1*l1inpStimDur);
|
|
|
+ PictureSequenceInput* TuneInp = new PictureSequenceInput(BlobInputLayer, csimInputChannel_AMPA, istrength, l1inpStimDur, 1*l1inpStimDur);
|
|
|
vector<vector<float> > StimulusArray;
|
|
|
int NStim=4;
|
|
|
for (int i=0;i<NStim;++i) {
|
|
@@ -465,7 +465,7 @@ int main(int argc, char** argv)
|
|
|
break;
|
|
|
case InpNoOverlap:
|
|
|
{
|
|
|
- PictureSequenceInput* TuneInp = new PictureSequenceInput(BlobInputLayer, 0,istrength, l1inpStimDur, 1*l1inpStimDur);
|
|
|
+ PictureSequenceInput* TuneInp = new PictureSequenceInput(BlobInputLayer, csimInputChannel_AMPA, istrength, l1inpStimDur, 1*l1inpStimDur);
|
|
|
vector<vector<float> > StimulusArray;
|
|
|
int NStim=4;
|
|
|
for (int i=0;i<NStim;++i) {
|
|
@@ -487,7 +487,7 @@ int main(int argc, char** argv)
|
|
|
break;
|
|
|
case OnePicture:
|
|
|
{
|
|
|
- PictureSequenceInput* WinkelInput = new PictureSequenceInput(BlobInputLayer, 0,istrength, l1inpStimDur, IsiDur);
|
|
|
+ PictureSequenceInput* WinkelInput = new PictureSequenceInput(BlobInputLayer, csimInputChannel_AMPA, istrength, l1inpStimDur, IsiDur);
|
|
|
WinkelInput->SetPictureArray(&MyMovie);
|
|
|
WinkelInput->SetName("WinkelInput");
|
|
|
WinkelInput->SetMode(csimInputRandom);
|