Skip to content

Commit f9fbd82

Browse files
adampdpadampdp
committed
updated RS18 muscle json
1 parent 8fce758 commit f9fbd82

File tree

408 files changed

+8073
-9703
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

408 files changed

+8073
-9703
lines changed

‎Worm2D/Worm2D.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ void Worm2Dm::InitializeState(RandomState &rs)
9999
}
100100

101101
int Worm2Dm::nn(int neuronNumber, int unitNumber)
102-
{
102+
{
103+
if (unitNumber==1) return neuronNumber;
103104
return neuronNumber+((unitNumber-1)*par1.N_neuronsperunit);
104105
}
105106

‎Worm2D/Worm2D21.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ void Worm2D21m::InitializeState(RandomState &rs)
9494
{
9595
cout << "Worm2D21m init state" << endl;
9696
Worm2Dm::InitializeState(rs);
97+
for (int i = 1; i <= par1.N_size; i++)
98+
n_ptr->SetNeuronExternalInput(i,0); //adam set all initial inputs to zero
9799
return;
98100
}
99101

‎Worm2D/WormRS18.cpp

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -200,35 +200,29 @@ void Worm18::InitializeState(RandomState &rs)
200200
Worm2D::InitializeState(rs);
201201
}
202202

203-
/* void Worm18::HeadStep(double StepSize, double output)
204-
{
205-
// Update Nervous System
206-
h.EulerStep(StepSize);
207-
208-
// Time
209-
t += StepSize;
210-
} */
211203

212204

213205
vector<toFromWeight> Worm18::makeVentralMuscleConn()
214206
{
215207
vector<toFromWeight> vec1;
216208

217-
{vector<int> neurons({SMDV, RMDV});
218-
vector<double> NMJ({NMJ_SMDV, NMJ_RMDD});
219-
for (int i = 1; i <= HeadMotorNeuronMuscles; i++)
220-
makeMuscleConnHelp(vec1, neurons, NMJ, 1, i, NMJ_Gain);}
209+
{vector<int> neurons({SMDV, RMDV});
210+
vector<double> NMJ({NMJ_SMDV, NMJ_RMDD});
211+
for (int i = 1; i <= HeadMotorNeuronMuscles; i++)
212+
makeMuscleConnHelp(vec1, neurons, NMJ, 1, i, NMJ_Gain);}
221213

222214

223215
vector<int> neuronsA({VDA, VBA});
224216
vector<int> neuronsP({VDP, VBP});
225217
vector<double> NMJA({NMJ_VDa, NMJ_VBa});
226218
vector<double> NMJP({NMJ_VDp, NMJ_VBp});
227-
vector<double> NMJA2({NMJ_VDa/2, NMJ_VBa/2});
228-
vector<double> NMJP2({NMJ_VDp/2, NMJ_VBp/2});
219+
vector<double> NMJA2({NMJ_VDa/2.0, NMJ_VBa/2.0});
220+
vector<double> NMJP2({NMJ_VDp/2.0, NMJ_VBp/2.0});
221+
229222
for (int i = VNCMuscleStart; i <= par1.N_muscles; i++){
230223
int mi = (int) ((i-VNCMuscleStart)/NmusclePerNU)+1;
231-
int mt = (i-VNCMuscleStart)%NmusclePerNU;
224+
//int mt = (i-VNCMuscleStart)%NmusclePerNU;
225+
int mt = 1;
232226
switch(mt){
233227
case 0:
234228
makeMuscleConnHelp(vec1, neuronsA, NMJA, mi, i, NMJ_Gain);
@@ -310,8 +304,6 @@ void Worm18::setMuscleInputOrig(double StepSize)
310304
// Update Muscle activation
311305
m.EulerStep(StepSize);
312306

313-
314-
315307
}
316308

317309

‎exampleRun/LEMS_Worm2D.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<!--
44
5-
This LEMS file has been automatically generated using PyNeuroML v1.3.15 (libNeuroML v0.6.5)
5+
This LEMS file has been automatically generated using PyNeuroML v1.3.17 (libNeuroML v0.6.5)
66
77
-->
88

‎exampleRun/Worm2D.net.nml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<network id="Worm2DNet">
55
<population id="PopDA" component="DA" size="10" type="populationList">
66
<property tag="color" value=".82 .7 .43"/>
7-
<property tag="type" value="E"/>
87
<instance id="0">
98
<location x="100.0" y="-100.0" z="0.0"/>
109
</instance>
@@ -38,7 +37,6 @@
3837
</population>
3938
<population id="PopDB" component="DB" size="10" type="populationList">
4039
<property tag="color" value=".43 .69 .67"/>
41-
<property tag="type" value="E"/>
4240
<instance id="0">
4341
<location x="100.0" y="0.0" z="0.0"/>
4442
</instance>
@@ -72,7 +70,6 @@
7270
</population>
7371
<population id="PopDD" component="DD" size="10" type="populationList">
7472
<property tag="color" value=".24 .32 .62"/>
75-
<property tag="type" value="I"/>
7673
<instance id="0">
7774
<location x="100.0" y="100.0" z="0.0"/>
7875
</instance>
@@ -106,7 +103,6 @@
106103
</population>
107104
<population id="PopVA" component="VA" size="10" type="populationList">
108105
<property tag="color" value=".52 .33 .17"/>
109-
<property tag="type" value="E"/>
110106
<instance id="0">
111107
<location x="-100.0" y="-100.0" z="0.0"/>
112108
</instance>
@@ -140,7 +136,6 @@
140136
</population>
141137
<population id="PopVB" component="VB" size="10" type="populationList">
142138
<property tag="color" value=".17 .4 .37"/>
143-
<property tag="type" value="E"/>
144139
<instance id="0">
145140
<location x="-100.0" y="0.0" z="0.0"/>
146141
</instance>
@@ -174,7 +169,6 @@
174169
</population>
175170
<population id="PopVD" component="VD" size="10" type="populationList">
176171
<property tag="color" value=".65 .78 .9"/>
177-
<property tag="type" value="I"/>
178172
<instance id="0">
179173
<location x="-100.0" y="100.0" z="0.0"/>
180174
</instance>

‎exampleRun/Worm2DNet.gv.png

-6.88 KB
Loading

‎exampleRun/Worm2DNet_Continuous_conns_--sum_of_signed_weights-_cond_postpopsize-.png

1.05 KB
Loading

‎exampleRun/Worm2DNet_Continuous_conns_-avg_weight_per_existant_conn-.png

-3.15 KB
Loading

‎exampleRun/Worm2DNet_Continuous_conns_-sum_of_signed_weights_of_conns-.png

1.76 KB
Loading

‎exampleRun21W2D/LEMS_Worm2D.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<!--
44
5-
This LEMS file has been automatically generated using PyNeuroML v1.3.15 (libNeuroML v0.6.5)
5+
This LEMS file has been automatically generated using PyNeuroML v1.3.17 (libNeuroML v0.6.5)
66
77
-->
88

‎exampleRun21W2D/Worm2D.net.nml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<network id="Worm2DNet">
55
<population id="PopAS" component="AS" size="7" type="populationList">
66
<property tag="color" value=".80 .1 .30"/>
7-
<property tag="type" value="I"/>
87
<instance id="0">
98
<location x="0.0" y="0.0" z="0.0"/>
109
</instance>
@@ -29,7 +28,6 @@
2928
</population>
3029
<population id="PopDA" component="DA" size="7" type="populationList">
3130
<property tag="color" value=".82 .7 .43"/>
32-
<property tag="type" value="E"/>
3331
<instance id="0">
3432
<location x="100.0" y="-100.0" z="0.0"/>
3533
</instance>
@@ -54,7 +52,6 @@
5452
</population>
5553
<population id="PopDB" component="DB" size="7" type="populationList">
5654
<property tag="color" value=".43 .69 .67"/>
57-
<property tag="type" value="E"/>
5855
<instance id="0">
5956
<location x="100.0" y="0.0" z="0.0"/>
6057
</instance>
@@ -79,7 +76,6 @@
7976
</population>
8077
<population id="PopDD" component="DD" size="7" type="populationList">
8178
<property tag="color" value=".24 .32 .62"/>
82-
<property tag="type" value="I"/>
8379
<instance id="0">
8480
<location x="100.0" y="100.0" z="0.0"/>
8581
</instance>
@@ -104,7 +100,6 @@
104100
</population>
105101
<population id="PopVA" component="VA" size="7" type="populationList">
106102
<property tag="color" value=".52 .33 .17"/>
107-
<property tag="type" value="E"/>
108103
<instance id="0">
109104
<location x="-100.0" y="-100.0" z="0.0"/>
110105
</instance>
@@ -129,7 +124,6 @@
129124
</population>
130125
<population id="PopVB" component="VB" size="7" type="populationList">
131126
<property tag="color" value=".17 .4 .37"/>
132-
<property tag="type" value="E"/>
133127
<instance id="0">
134128
<location x="-100.0" y="0.0" z="0.0"/>
135129
</instance>
@@ -154,7 +148,6 @@
154148
</population>
155149
<population id="PopVD" component="VD" size="7" type="populationList">
156150
<property tag="color" value=".65 .78 .9"/>
157-
<property tag="type" value="I"/>
158151
<instance id="0">
159152
<location x="-100.0" y="100.0" z="0.0"/>
160153
</instance>

‎exampleRun21W2D/Worm2DNet.gv.png

-3.68 KB
Loading

‎exampleRun21W2D/Worm2DNet_Continuous_conns_--sum_of_signed_weights-_cond_postpopsize-.png

1.02 KB
Loading

‎exampleRun21W2D/Worm2DNet_Continuous_conns_-avg_weight_per_existant_conn-.png

-3.3 KB
Loading

‎exampleRun21W2D/Worm2DNet_Continuous_conns_-sum_of_signed_weights_of_conns-.png

-1.03 KB
Loading

‎exampleRun21W2D/behavior.pdf

0 Bytes
Binary file not shown.

‎exampleRunCEW2D/LEMS_Worm2D.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<!--
44
5-
This LEMS file has been automatically generated using PyNeuroML v1.3.15 (libNeuroML v0.6.5)
5+
This LEMS file has been automatically generated using PyNeuroML v1.3.17 (libNeuroML v0.6.5)
66
77
-->
88

‎exampleRunCEW2D/Worm2D.net.nml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<network id="Worm2DNet">
55
<population id="PopDA" component="DA" size="10" type="populationList">
66
<property tag="color" value=".82 .7 .43"/>
7-
<property tag="type" value="E"/>
87
<instance id="0">
98
<location x="100.0" y="-100.0" z="0.0"/>
109
</instance>
@@ -38,7 +37,6 @@
3837
</population>
3938
<population id="PopDB" component="DB" size="10" type="populationList">
4039
<property tag="color" value=".43 .69 .67"/>
41-
<property tag="type" value="E"/>
4240
<instance id="0">
4341
<location x="100.0" y="0.0" z="0.0"/>
4442
</instance>
@@ -72,7 +70,6 @@
7270
</population>
7371
<population id="PopDD" component="DD" size="10" type="populationList">
7472
<property tag="color" value=".24 .32 .62"/>
75-
<property tag="type" value="I"/>
7673
<instance id="0">
7774
<location x="100.0" y="100.0" z="0.0"/>
7875
</instance>
@@ -106,7 +103,6 @@
106103
</population>
107104
<population id="PopVA" component="VA" size="10" type="populationList">
108105
<property tag="color" value=".52 .33 .17"/>
109-
<property tag="type" value="E"/>
110106
<instance id="0">
111107
<location x="-100.0" y="-100.0" z="0.0"/>
112108
</instance>
@@ -140,7 +136,6 @@
140136
</population>
141137
<population id="PopVB" component="VB" size="10" type="populationList">
142138
<property tag="color" value=".17 .4 .37"/>
143-
<property tag="type" value="E"/>
144139
<instance id="0">
145140
<location x="-100.0" y="0.0" z="0.0"/>
146141
</instance>
@@ -174,7 +169,6 @@
174169
</population>
175170
<population id="PopVD" component="VD" size="10" type="populationList">
176171
<property tag="color" value=".65 .78 .9"/>
177-
<property tag="type" value="I"/>
178172
<instance id="0">
179173
<location x="-100.0" y="100.0" z="0.0"/>
180174
</instance>

‎exampleRunCEW2D/Worm2DNet.gv.png

-6.88 KB
Loading

‎exampleRunCEW2D/Worm2DNet_Continuous_conns_--sum_of_signed_weights-_cond_postpopsize-.png

1.05 KB
Loading

‎exampleRunCEW2D/Worm2DNet_Continuous_conns_-avg_weight_per_existant_conn-.png

-3.15 KB
Loading

‎exampleRunCEW2D/Worm2DNet_Continuous_conns_-sum_of_signed_weights_of_conns-.png

1.76 KB
Loading

‎exampleRunCEW2D/behavior.pdf

0 Bytes
Binary file not shown.

‎exampleRunCEW2D_nml/behavior.pdf

0 Bytes
Binary file not shown.

‎exampleRunRS18W2D/behavior.pdf

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)