Skip to content

Commit 58c1879

Browse files
AndrewBMadisonAndrewBMadison
committed
clang formatting
1 parent 2ebf4a1 commit 58c1879

File tree

5 files changed

+40
-22
lines changed

5 files changed

+40
-22
lines changed

‎Simulator/Connections/NG911/Connections911.cpp‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,8 @@ bool Connections911::erasePSAP(AllVertices &vertices, Layout &layout)
194194
}
195195

196196
// Identify all psap-less responders
197-
if (layout.vertexTypeMap_[destVertex] == vertexType::LAW || layout.vertexTypeMap_[destVertex] == vertexType::FIRE
197+
if (layout.vertexTypeMap_[destVertex] == vertexType::LAW
198+
|| layout.vertexTypeMap_[destVertex] == vertexType::FIRE
198199
|| layout.vertexTypeMap_[destVertex] == vertexType::EMS) {
199200
respsToReroute.push_back(destVertex);
200201
}
@@ -229,8 +230,8 @@ bool Connections911::erasePSAP(AllVertices &vertices, Layout &layout)
229230
}
230231

231232
// Insert Caller to PSAP edge
232-
BGSIZE iEdg
233-
= edges_->addEdge(edgeType::CP, srcVertex, closestPSAP, Simulator::getInstance().getDeltaT());
233+
BGSIZE iEdg = edges_->addEdge(edgeType::CP, srcVertex, closestPSAP,
234+
Simulator::getInstance().getDeltaT());
234235

235236
// Record added edge
236237
ChangedEdge addedEdge;
@@ -257,8 +258,8 @@ bool Connections911::erasePSAP(AllVertices &vertices, Layout &layout)
257258
}
258259

259260
// Insert PSAP to Responder edge
260-
BGSIZE iEdg
261-
= edges_->addEdge(edgeType::PR, closestPSAP, destVertex, Simulator::getInstance().getDeltaT());
261+
BGSIZE iEdg = edges_->addEdge(edgeType::PR, closestPSAP, destVertex,
262+
Simulator::getInstance().getDeltaT());
262263

263264
// Record added edge
264265
ChangedEdge addedEdge;
@@ -281,7 +282,8 @@ bool Connections911::eraseRESP(AllVertices &vertices, Layout &layout)
281282

282283
// Find all resps
283284
for (int i = 0; i < numVertices; i++) {
284-
if (layout.vertexTypeMap_[i] == vertexType::LAW || layout.vertexTypeMap_[i] == vertexType::FIRE
285+
if (layout.vertexTypeMap_[i] == vertexType::LAW
286+
|| layout.vertexTypeMap_[i] == vertexType::FIRE
285287
|| layout.vertexTypeMap_[i] == vertexType::EMS) {
286288
resps.push_back(i);
287289
}

‎Simulator/Edges/Neuro/AllSynapsesDeviceFuncs_d.cpp‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -499,13 +499,17 @@ CUDA_CALLABLE void eraseSpikingSynapse(AllSpikingSynapsesDeviceProperties *allEd
499499
/// @param destVertex Index of the destination neuron.
500500
CUDA_CALLABLE edgeType edgType(vertexType *neuronTypeMap_d, int srcVertex, int destVertex)
501501
{
502-
if (neuronTypeMap_d[srcVertex] == vertexType::INH && neuronTypeMap_d[destVertex] == vertexType::INH)
502+
if (neuronTypeMap_d[srcVertex] == vertexType::INH
503+
&& neuronTypeMap_d[destVertex] == vertexType::INH)
503504
return edgeType::II;
504-
else if (neuronTypeMap_d[srcVertex] == vertexType::INH && neuronTypeMap_d[destVertex] == vertexType::EXC)
505+
else if (neuronTypeMap_d[srcVertex] == vertexType::INH
506+
&& neuronTypeMap_d[destVertex] == vertexType::EXC)
505507
return edgeType::IE;
506-
else if (neuronTypeMap_d[srcVertex] == vertexType::EXC && neuronTypeMap_d[destVertex] == vertexType::INH)
508+
else if (neuronTypeMap_d[srcVertex] == vertexType::EXC
509+
&& neuronTypeMap_d[destVertex] == vertexType::INH)
507510
return edgeType::EI;
508-
else if (neuronTypeMap_d[srcVertex] == vertexType::EXC && neuronTypeMap_d[destVertex] == vertexType::EXC)
511+
else if (neuronTypeMap_d[srcVertex] == vertexType::EXC
512+
&& neuronTypeMap_d[destVertex] == vertexType::EXC)
509513
return edgeType::EE;
510514

511515
return edgeType::ETYPE_UNDEF;

‎Simulator/Layouts/NG911/Layout911.cpp‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,21 +115,27 @@ void Layout911::generateVertexTypeMap()
115115
// Returns the type of synapse at the given coordinates
116116
edgeType Layout911::edgType(int srcVertex, int destVertex)
117117
{
118-
if (vertexTypeMap_[srcVertex] == vertexType::CALR && vertexTypeMap_[destVertex] == vertexType::PSAP)
118+
if (vertexTypeMap_[srcVertex] == vertexType::CALR
119+
&& vertexTypeMap_[destVertex] == vertexType::PSAP)
119120
return edgeType::CP;
120121
else if (vertexTypeMap_[srcVertex] == vertexType::PSAP
121-
&& (vertexTypeMap_[destVertex] == vertexType::LAW || vertexTypeMap_[destVertex] == vertexType::FIRE
122+
&& (vertexTypeMap_[destVertex] == vertexType::LAW
123+
|| vertexTypeMap_[destVertex] == vertexType::FIRE
122124
|| vertexTypeMap_[destVertex] == vertexType::EMS))
123125
return edgeType::PR;
124-
else if (vertexTypeMap_[srcVertex] == vertexType::PSAP && vertexTypeMap_[destVertex] == vertexType::CALR)
126+
else if (vertexTypeMap_[srcVertex] == vertexType::PSAP
127+
&& vertexTypeMap_[destVertex] == vertexType::CALR)
125128
return edgeType::PC;
126-
else if (vertexTypeMap_[srcVertex] == vertexType::PSAP && vertexTypeMap_[destVertex] == vertexType::PSAP)
129+
else if (vertexTypeMap_[srcVertex] == vertexType::PSAP
130+
&& vertexTypeMap_[destVertex] == vertexType::PSAP)
127131
return edgeType::PP;
128-
else if ((vertexTypeMap_[srcVertex] == vertexType::LAW || vertexTypeMap_[destVertex] == vertexType::FIRE
132+
else if ((vertexTypeMap_[srcVertex] == vertexType::LAW
133+
|| vertexTypeMap_[destVertex] == vertexType::FIRE
129134
|| vertexTypeMap_[destVertex] == vertexType::EMS)
130135
&& vertexTypeMap_[destVertex] == vertexType::PSAP)
131136
return edgeType::RP;
132-
else if ((vertexTypeMap_[srcVertex] == vertexType::LAW || vertexTypeMap_[destVertex] == vertexType::FIRE
137+
else if ((vertexTypeMap_[srcVertex] == vertexType::LAW
138+
|| vertexTypeMap_[destVertex] == vertexType::FIRE
133139
|| vertexTypeMap_[destVertex] == vertexType::EMS)
134140
&& vertexTypeMap_[destVertex] == vertexType::CALR)
135141
return edgeType::RC;

‎Simulator/Layouts/Neuro/LayoutNeuro.cpp‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,17 @@ void LayoutNeuro::initStarterMap()
104104
/// @return type of the synapse.
105105
edgeType LayoutNeuro::edgType(int srcVertex, int destVertex)
106106
{
107-
if (vertexTypeMap_[srcVertex] == vertexType::INH && vertexTypeMap_[destVertex] == vertexType::INH)
107+
if (vertexTypeMap_[srcVertex] == vertexType::INH
108+
&& vertexTypeMap_[destVertex] == vertexType::INH)
108109
return edgeType::II;
109-
else if (vertexTypeMap_[srcVertex] == vertexType::INH && vertexTypeMap_[destVertex] == vertexType::EXC)
110+
else if (vertexTypeMap_[srcVertex] == vertexType::INH
111+
&& vertexTypeMap_[destVertex] == vertexType::EXC)
110112
return edgeType::IE;
111-
else if (vertexTypeMap_[srcVertex] == vertexType::EXC && vertexTypeMap_[destVertex] == vertexType::INH)
113+
else if (vertexTypeMap_[srcVertex] == vertexType::EXC
114+
&& vertexTypeMap_[destVertex] == vertexType::INH)
112115
return edgeType::EI;
113-
else if (vertexTypeMap_[srcVertex] == vertexType::EXC && vertexTypeMap_[destVertex] == vertexType::EXC)
116+
else if (vertexTypeMap_[srcVertex] == vertexType::EXC
117+
&& vertexTypeMap_[destVertex] == vertexType::EXC)
114118
return edgeType::EE;
115119

116120
return edgeType::ETYPE_UNDEF;

‎Simulator/Recorders/NG911/Xml911Recorder.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,12 @@ void Xml911Recorder::saveSimData()
3636
VectorMatrix oldTypes(MATRIX_TYPE, MATRIX_INIT, 1, Simulator::getInstance().getTotalVertices(),
3737
static_cast<float>(vertexType::EXC));
3838
VectorMatrix vertexTypes(MATRIX_TYPE, MATRIX_INIT, 1,
39-
Simulator::getInstance().getTotalVertices(), static_cast<float>(vertexType::EXC));
39+
Simulator::getInstance().getTotalVertices(),
40+
static_cast<float>(vertexType::EXC));
4041

4142
for (int i = 0; i < Simulator::getInstance().getTotalVertices(); i++) {
42-
vertexTypes[i] = static_cast<float>(Simulator::getInstance().getModel().getLayout().vertexTypeMap_[i]);
43+
vertexTypes[i]
44+
= static_cast<float>(Simulator::getInstance().getModel().getLayout().vertexTypeMap_[i]);
4345
oldTypes[i] = static_cast<float>(conns911.oldTypeMap_[i]);
4446
}
4547

0 commit comments

Comments
 (0)