fixed enum classes

Author: AndrewBMadison

Simulator/Edges/AllEdges.cpp

@@ -116,7 +116,7 @@ void AllEdges::writeEdge(ostream &output, BGSIZE iEdg) const
    output << sourceVertexIndex_[iEdg] << ends;
    output << destVertexIndex_[iEdg] << ends;
    output << W_[iEdg] << ends;
-   output << static_cast<int>(type_[iEdg]) << ends;
+   output << type_[iEdg] << ends;
    output << (inUse_[iEdg] == 1 ? "true" : "false") << ends;
 }
 

Simulator/Edges/Neuro/AllDSSynapses_d.cpp

@@ -310,7 +310,7 @@ void AllDSSynapses::printGPUEdgesProps(void *allEdgesDeviceProps) const
             cout << "GPU W[" << i << "] = " << WPrint[i];
             cout << " GPU sourNeuron: " << sourceNeuronIndexPrint[i];
             cout << " GPU desNeuron: " << destNeuronIndexPrint[i];
-            cout << " GPU type: " << static_cast<int>(typePrint[i]);
+            cout << " GPU type: " << typePrint[i];
             cout << " GPU psr: " << psrPrint[i];
             cout << " GPU in_use:" << (inUsePrint[i] == 1 ? "true" : "false");
 

Simulator/Edges/Neuro/AllDynamicSTDPSynapses_d.cpp

@@ -349,7 +349,7 @@ void AllDynamicSTDPSynapses::printGPUEdgesProps(void *allEdgesDeviceProps) const
             cout << "GPU W[" << i << "] = " << WPrint[i];
             cout << " GPU sourNeuron: " << sourceNeuronIndexPrint[i];
             cout << " GPU desNeuron: " << destNeuronIndexPrint[i];
-            cout << " GPU type: " << static_cast<int>(typePrint[i]);
+            cout << " GPU type: " << typePrint[i];
             cout << " GPU psr: " << psrPrint[i];
             cout << " GPU in_use:" << (inUsePrint[i] == 1 ? "true" : "false");
 

Simulator/Edges/Neuro/AllNeuroEdges.cpp

@@ -72,7 +72,7 @@ void AllNeuroEdges::writeEdge(ostream &output, BGSIZE iEdg) const
    output << destVertexIndex_[iEdg] << ends;
    output << W_[iEdg] << ends;
    output << psr_[iEdg] << ends;
-   output << static_cast<int>(type_[iEdg]) << ends;
+   output << type_[iEdg] << ends;
    output << (inUse_[iEdg] == 1 ? "true" : "false") << ends;
 }
 
@@ -107,7 +107,7 @@ void AllNeuroEdges::printSynapsesProps() const
          cout << "W[" << i << "] = " << W_[i];
          cout << " sourNeuron: " << sourceVertexIndex_[i];
          cout << " desNeuron: " << destVertexIndex_[i];
-         cout << " type: " << static_cast<int>(type_[i]);
+         cout << " type: " << type_[i];
          cout << " psr: " << psr_[i];
          cout << " in_use:" << (inUse_[i] == 1 ? "true" : "false");
       }

Simulator/Edges/Neuro/AllSTDPSynapses_d.cpp

@@ -387,7 +387,7 @@ void AllSTDPSynapses::printGPUEdgesProps(void *allEdgesDeviceProps) const
             cout << "GPU W[" << i << "] = " << WPrint[i];
             cout << " GPU sourNeuron: " << sourceNeuronIndexPrint[i];
             cout << " GPU desNeuron: " << destNeuronIndexPrint[i];
-            cout << " GPU type: " << static_cast<int>(typePrint[i]);
+            cout << " GPU type: " << typePrint[i];
             cout << " GPU psr: " << psrPrint[i];
             cout << " GPU in_use:" << (inUsePrint[i] == 1 ? "true" : "false");
 

Simulator/Edges/Neuro/AllSpikingSynapses_d.cpp

@@ -405,7 +405,7 @@ void AllSpikingSynapses::printGPUEdgesProps(void *allEdgesDeviceProps) const
             cout << "GPU W[" << i << "] = " << WPrint[i];
             cout << " GPU sourNeuron: " << sourceNeuronIndexPrint[i];
             cout << " GPU desNeuron: " << destNeuronIndexPrint[i];
-            cout << " GPU type: " << static_cast<int>(typePrint[i]);
+            cout << " GPU type: " << typePrint[i];
             cout << " GPU psr: " << psrPrint[i];
             cout << " GPU in_use:" << (inUsePrint[i] == 1 ? "true" : "false");
             cout << " GPU decay: " << decayPrint[i];

Simulator/Utils/Global.cpp

@@ -62,7 +62,7 @@ string neuronTypeToString(vertexType t)
       case vertexType::EXC:
          return "EXC";
       default:
-         cerr << "ERROR->neuronTypeToString() failed, unknown type: " << static_cast<int>(t) << endl;
+         cerr << "ERROR->neuronTypeToString() failed, unknown type: " << t << endl;
          assert(false);
          return nullptr;   // Must return a value -- this will probably cascade to another failure
    }

Simulator/Utils/Global.h

@@ -111,6 +111,11 @@ enum class vertexType {
    // UNDEF
    VTYPE_UNDEF = 0
 };
+// Custom streaming operator<< for the enum class vertexType
+inline std::ostream& operator<<(std::ostream& os, vertexType vT) {
+    os << static_cast<int>(vT);
+    return os;
+}
 
 // Edge types.
 // NEURO:
@@ -140,6 +145,11 @@ enum class edgeType {
    // UNDEF
    ETYPE_UNDEF = -1
 };
+// Custom streaming operator<< for the enum class edgeType
+inline std::ostream& operator<<(std::ostream& os, edgeType eT) {
+    os << static_cast<int>(eT);
+    return os;
+}
 
 // The default membrane capacitance.
 #define DEFAULT_Cm (3e-8)

Simulator/Vertices/Neuro/AllIFNeurons.cpp

@@ -142,7 +142,7 @@ void AllIFNeurons::createNeuron(int i, Layout &layout)
 
       default:
          LOG4CPLUS_DEBUG(vertexLogger_,
-                         "ERROR: unknown neuron type: " << static_cast<int>(layout.vertexTypeMap_[i]) << "@" << i);
+                         "ERROR: unknown neuron type: " << layout.vertexTypeMap_[i] << "@" << i);
          assert(false);
          break;
    }