Skip to content

Commit 292ca1d

Browse files
author
Divya Kamath
committed
Fixed few code style violation
1 parent 088bdbb commit 292ca1d

File tree

11 files changed

+29
-39
lines changed

11 files changed

+29
-39
lines changed

‎Simulator/Edges/NG911/All911Edges.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ class All911Edges : public AllEdges {
7070
int maxEdgesPerVertex) {};
7171
virtual void deleteEdgeDeviceStruct(void *allEdgesDevice) {};
7272
virtual void copyEdgeHostToDevice(void *allEdgesDevice) {};
73-
virtual void copyEdgeHostToDevice(void *allEdgesDevice, int numVertices,
74-
int maxEdgesPerVertex) {};
73+
virtual void copyEdgeHostToDevice(void *allEdgesDevice, int numVertices, int maxEdgesPerVertex) {
74+
};
7575
virtual void copyEdgeDeviceToHost(void *allEdgesDevice) {};
7676
virtual void copyDeviceEdgeCountsToHost(void *allEdgesDevice) {};
7777
virtual void copyDeviceEdgeSumIdxToHost(void *allEdgesDevice) {};

‎Simulator/Edges/Neuro/AllDSSynapses_d.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,8 +328,7 @@ void AllDSSynapses::printGPUEdgesProps(void *allEdgesDeviceProps) const
328328
}
329329

330330
for (int i = 0; i < countVertices_; i++) {
331-
cout << "GPU edge_counts:"
332-
<< "neuron[" << i << "]" << synapseCountsPrint[i] << endl;
331+
cout << "GPU edge_counts:" << "neuron[" << i << "]" << synapseCountsPrint[i] << endl;
333332
}
334333

335334
cout << "GPU totalSynapseCount:" << totalSynapseCountPrint << endl;

‎Simulator/Edges/Neuro/AllDynamicSTDPSynapses_d.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,8 +380,7 @@ void AllDynamicSTDPSynapses::printGPUEdgesProps(void *allEdgesDeviceProps) const
380380
}
381381

382382
for (int i = 0; i < countVertices_; i++) {
383-
cout << "GPU edge_counts:"
384-
<< "neuron[" << i << "]" << synapseCountsPrint[i] << endl;
383+
cout << "GPU edge_counts:" << "neuron[" << i << "]" << synapseCountsPrint[i] << endl;
385384
}
386385

387386
cout << "GPU totalSynapseCount:" << totalSynapseCountPrint << endl;

‎Simulator/Edges/Neuro/AllNeuroEdges.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,7 @@ void AllNeuroEdges::printSynapsesProps() const
114114
}
115115

116116
for (int i = 0; i < countVertices_; i++) {
117-
cout << "edge_counts:"
118-
<< "vertex[" << i << "]" << edgeCounts_[i] << endl;
117+
cout << "edge_counts:" << "vertex[" << i << "]" << edgeCounts_[i] << endl;
119118
}
120119

121120
cout << "totalEdgeCount:" << totalEdgeCount_ << endl;

‎Simulator/Edges/Neuro/AllSTDPSynapses.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ void AllSTDPSynapses::printParameters() const
122122
<< endl
123123
<< "\tEdges type: AllSTDPSynapses" << endl
124124
<< endl
125-
126125
<< "\tSTDP gap" << defaultSTDPgap_ << endl
127126
<< "\n\tTauspost value: ["
128127
<< " I: " << tauspost_I_ << ", "

‎Simulator/Edges/Neuro/AllSTDPSynapses_d.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,8 +409,7 @@ void AllSTDPSynapses::printGPUEdgesProps(void *allEdgesDeviceProps) const
409409
}
410410
}
411411
for (int i = 0; i < countVertices_; i++) {
412-
cout << "GPU edge_counts:"
413-
<< "neuron[" << i << "]" << synapseCountsPrint[i] << endl;
412+
cout << "GPU edge_counts:" << "neuron[" << i << "]" << synapseCountsPrint[i] << endl;
414413
}
415414
cout << "GPU totalSynapseCount:" << totalSynapseCountPrint << endl;
416415
cout << "GPU maxEdgesPerVertex:" << maxEdgesPerVertexPrint << endl;

‎Simulator/Edges/Neuro/AllSpikingSynapses.cpp‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -107,17 +107,15 @@ void AllSpikingSynapses::printParameters() const
107107
<< endl
108108
<< "\tEdges type: AllSpikingSynapses" << endl
109109
<< endl);
110-
LOG4CPLUS_DEBUG(edgeLogger_, "\n\tTau values: ["
111-
<< " II: " << tau_II_ << ", "
112-
<< " IE: " << tau_IE_ << ","
113-
<< "EI : " << tau_EI_ << ","
114-
<< " EE: " << tau_EE_ << "]" << endl);
115-
116-
LOG4CPLUS_DEBUG(edgeLogger_, "\n\tDelay values: ["
117-
<< " II: " << delay_II_ << ", "
118-
<< " IE: " << delay_IE_ << ","
119-
<< "EI :" << delay_EI_ << ","
120-
<< " EE: " << delay_EE_ << "]" << endl);
110+
LOG4CPLUS_DEBUG(edgeLogger_, "\n\tTau values: [" << " II: " << tau_II_ << ","
111+
<< " IE: " << tau_IE_ << ","
112+
<< " EI: " << tau_EI_ << ","
113+
<< " EE: " << tau_EE_ << "]" << endl);
114+
115+
LOG4CPLUS_DEBUG(edgeLogger_, "\n\tDelay values: [" << " II: " << delay_II_ << ","
116+
<< " IE: " << delay_IE_ << ","
117+
<< " EI:" << delay_EI_ << ","
118+
<< " EE: " << delay_EE_ << "]" << endl);
121119
}
122120

123121
/// Sets the data for Synapse to input's data.

‎Simulator/Edges/Neuro/AllSpikingSynapses_d.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -415,8 +415,7 @@ void AllSpikingSynapses::printGPUEdgesProps(void *allEdgesDeviceProps) const
415415
}
416416
}
417417
for (int i = 0; i < countVertices_; i++) {
418-
cout << "GPU edge_counts:"
419-
<< "neuron[" << i << "]" << synapseCountsPrint[i] << endl;
418+
cout << "GPU edge_counts:" << "neuron[" << i << "]" << synapseCountsPrint[i] << endl;
420419
}
421420
cout << "GPU totalSynapseCount:" << totalSynapseCountPrint << endl;
422421
cout << "GPU maxEdgesPerVertex:" << maxEdgesPerVertexPrint << endl;

‎Simulator/Utils/Inputs/FSInput.cpp‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,24 @@
2222
/// @return a pointer to a SInput object
2323
ISInput *FSInput::CreateInstance()
2424
{
25-
if (Simulator::getInstance().getStimulusFileName().empty()) {
25+
auto stimulusFileName = Simulator::getInstance().getStimulusFileName();
26+
if (stimulusFileName.empty()) {
2627
return nullptr;
2728
}
2829

2930
// load stimulus input file
30-
TiXmlDocument siDoc(Simulator::getInstance().getStimulusFileName().c_str());
31+
TiXmlDocument siDoc(stimulusFileName.c_str());
3132
if (!siDoc.LoadFile()) {
32-
cerr << "Failed loading stimulus input file "
33-
<< Simulator::getInstance().getStimulusFileName() << ":"
34-
<< "\n\t" << siDoc.ErrorDesc() << endl;
33+
cerr << "Failed loading stimulus input file " << stimulusFileName << ":" << "\n\t"
34+
<< siDoc.ErrorDesc() << endl;
3535
cerr << " error: " << siDoc.ErrorRow() << ", " << siDoc.ErrorCol() << endl;
3636
return nullptr;
3737
}
3838

3939
// load input parameters
4040
TiXmlElement *parms = nullptr;
4141
if ((parms = siDoc.FirstChildElement("InputParams")) == nullptr) {
42-
cerr << "Could not find <InputParms> in stimulus input file "
43-
<< Simulator::getInstance().getStimulusFileName() << endl;
42+
cerr << "Could not find <InputParms> in stimulus input file " << stimulusFileName << endl;
4443
return nullptr;
4544
}
4645

‎Simulator/Utils/Inputs/SInputPoisson.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@ SInputPoisson::SInputPoisson(TiXmlElement *parms) :
6767
TiXmlDocument simDoc(maskNListFileName.c_str());
6868
if (!simDoc.LoadFile()) {
6969
cerr << "Failed loading positions of stimulus input mask neurons list file "
70-
<< maskNListFileName << ":"
71-
<< "\n\t" << simDoc.ErrorDesc() << endl;
70+
<< maskNListFileName << ":" << "\n\t" << simDoc.ErrorDesc() << endl;
7271
cerr << " error: " << simDoc.ErrorRow() << ", " << simDoc.ErrorCol() << endl;
7372
break;
7473
}

0 commit comments

Comments
 (0)