matched log information in cgraphitti validation mode with ggraphitti validation mode to allow for easier comparison

Author: AndrewBMadison

Simulator/Core/GPUModel.cpp

@@ -189,9 +189,9 @@ void GPUModel::advance()
                            cudaMemcpyDeviceToHost));
 
    for (int i = verts - 1; i >= 0; i--) {
-      LOG4CPLUS_DEBUG(vertexLogger_, "CUDA advance Index[ "
-                                        << i << "] :: Noise = " << randNoise_h[i]
-                                        << "\tVm: " << vm_h[i] << endl
+      LOG4CPLUS_DEBUG(vertexLogger_, endl
+                                        << "Advance Index[" << i << "] :: Noise = "
+                                        << randNoise_h[i] << "\tVm: " << vm_h[i] << endl
                                         << "\tsp = " << sp_h[i] << endl
                                         << "\tInoise = " << Inoise_h[i] << endl);
    }

Simulator/Vertices/Neuro/AllLIFNeurons.cpp

@@ -32,43 +32,49 @@ void AllLIFNeurons::advanceNeuron(int index)
    BGFLOAT &C2 = this->C2_[index];
    int &nStepsInRefr = this->numStepsInRefractoryPeriod_[index];
 
+   BGFLOAT noise;
    if (nStepsInRefr > 0) {
    // is neuron refractory?
    #ifdef VALIDATION_MODE
-      BGFLOAT noise = (*noiseRNG)();
-      LOG4CPLUS_DEBUG(vertexLogger_, "neuron refractory LIF[" << index << "] :: Noise = " << noise);
+      noise = (*noiseRNG)();
+         //LOG4CPLUS_DEBUG(vertexLogger_, "neuron refractory LIF[" << index << "] :: Noise = " << noise);
    #endif
       --nStepsInRefr;
    } else if (Vm >= Vthresh) {
    // should it fire?
    #ifdef VALIDATION_MODE
-      BGFLOAT noise = (*noiseRNG)();
-      LOG4CPLUS_DEBUG(vertexLogger_, "FIRE NEURON LIF[" << index << "] :: Noise = " << noise);
+      noise = (*noiseRNG)();
+         //LOG4CPLUS_DEBUG(vertexLogger_, "FIRE NEURON LIF[" << index << "] :: Noise = " << noise);
    #endif
       fire(index);
    } else {
       summationPoint += I0;   // add IO
       // add noise
-      BGFLOAT noise = (*noiseRNG)();
+      noise = (*noiseRNG)();
    #ifdef VALIDATION_MODE
-      LOG4CPLUS_DEBUG(vertexLogger_, "ADVANCE NEURON LIF[" << index << "] :: Noise = " << noise);
+         //LOG4CPLUS_DEBUG(vertexLogger_, "ADVANCE NEURON LIF[" << index << "] :: Noise = " << noise);
    #endif
       summationPoint += noise * Inoise;     // add noise
       Vm = C1 * Vm + C2 * summationPoint;   // decay Vm and add inputs
    }
 
    // Causes a huge slowdown since it's printed so frequently
    #ifdef VALIDATION_MODE
-   LOG4CPLUS_DEBUG(vertexLogger_, "Index: " << index << " Vm: " << Vm);
-   LOG4CPLUS_DEBUG(vertexLogger_, "NEURON[" << index << "] {" << endl
-                                            << "\tVm = " << Vm << endl
-                                            << "\tVthresh = " << Vthresh << endl
-                                            << "\tsummationPoint = " << summationPoint << endl
-                                            << "\tI0 = " << I0 << endl
-                                            << "\tInoise = " << Inoise << endl
-                                            << "\tC1 = " << C1 << endl
-                                            << "\tC2 = " << C2 << endl
-                                            << "}" << endl);
+   LOG4CPLUS_DEBUG(vertexLogger_, endl
+                                     << "Advance Index[" << index << "] :: Noise = " << noise
+                                     << "\tVm: " << Vm << endl
+                                     << "\tsp = " << summationPoint << endl
+                                     << "\tInoise = " << Inoise << endl);
+   // LOG4CPLUS_DEBUG(vertexLogger_, "Index: " << index << " Vm: " << Vm);
+   // LOG4CPLUS_DEBUG(vertexLogger_, "NEURON[" << index << "] {" << endl
+   //                                          << "\tVm = " << Vm << endl
+   //                                          << "\tVthresh = " << Vthresh << endl
+   //                                          << "\tsummationPoint = " << summationPoint << endl
+   //                                          << "\tI0 = " << I0 << endl
+   //                                          << "\tInoise = " << Inoise << endl
+   //                                          << "\tC1 = " << C1 << endl
+   //                                          << "\tC2 = " << C2 << endl
+   //                                          << "}" << endl);
    #endif
 
    // clear synaptic input for next time step