Fixed minor formatting

Author: Padmanabh Patil

Simulator/Core/Graphitti_Main.cpp

@@ -22,24 +22,22 @@
 #include "log4cplus/configurator.h"
 #include "log4cplus/logger.h"
 #include "log4cplus/loggingmacros.h"
+#include <cstdlib>
 #include <fstream>
 #include <iostream>
 #include <string>
 #include <unistd.h>
-#include <cstdlib>
 
 using namespace std;
 
 // Function to check whether there is a file given at a specific path
 bool findFile(string path)
 {
-
    // Opens the file at specified path
    ifstream newFile(path);
 
    // Checks if file is opened properly, otherwise results in an error and returns false
    if (newFile.is_open()) {
-      
       // Use good() to check if the file exists
       bool found = newFile.good();
       newFile.close();
@@ -61,7 +59,6 @@ bool findFile(string path)
 ///  @return -1 if error, else 0 if success.
 int main(int argc, char *argv[])
 {
-
    // Clear logging files at the start of each simulation
    fstream("Output/Debug/logging.txt", ios::out | ios::trunc);
    fstream("Output/Debug/vertices.txt", ios::out | ios::trunc);
@@ -73,7 +70,7 @@ int main(int argc, char *argv[])
    // This is to find the absolute path of the home directory log4cplus file
    string absPath = getenv("HOME");
    absPath = absPath + "/log4cplus_configure.ini";
-   
+
    // Checks whether the file is in the home directory
    // otherwise uses the file in RuntimeFiles
    if (findFile(absPath)) {

Simulator/Core/temp.txt

@@ -0,0 +1,93 @@
+/**
+ * @file Graphitti_Main.cpp
+ * 
+ * @ingroup Simulator/Core
+ *
+ * @brief Starting point of the Simulation - Main.
+ * 
+ *  The main functions calls the Core's runSimulation method which performs the following simulation steps:
+ *  1) Instantiates Simulator object
+ *  2) Parses command line to get configuration file and additional information if provided
+ *  3) Loads global Simulator parameters from configuration file
+ *  4) Instantiates all simulator objects (Layout, Connections, Synapases, Vertices)
+ *  5) Reads simulator objects' parameters from configuration file
+ *  6) Simulation setup (Deseralization, Initailizing values, etc.)
+ *  7) Run Simulation
+ *  8) Simulation shutdown (Save results, serialize)
+ *
+ * The Core is de-coupled from main to improve testability.
+ */
+
+#include "Core.h"
+#include "log4cplus/configurator.h"
+#include "log4cplus/logger.h"
+#include "log4cplus/loggingmacros.h"
+#include <cstdlib>
+#include <fstream>
+#include <iostream>
+#include <string>
+#include <unistd.h>
+
+using namespace std;
+
+// Function to check whether there is a file given at a specific path
+bool findFile(string path)
+{
+   // Opens the file at specified path
+   ifstream newFile(path);
+
+   // Checks if file is opened properly, otherwise results in an error and returns false
+   if (newFile.is_open()) {
+      // Use good() to check if the file exists
+      bool found = newFile.good();
+      newFile.close();
+      return found;
+
+   } else {
+      cerr << "ERROR opening file." << endl;
+   }
+
+   return false;
+}
+
+
+///  Main function calls the Core's runSimulation method which
+///  handles command line arguments and running the simulation.
+///
+///  @param  argc    argument count.
+///  @param  argv    arguments.
+///  @return -1 if error, else 0 if success.
+int main(int argc, char *argv[])
+{
+   // Clear logging files at the start of each simulation
+   fstream("Output/Debug/logging.txt", ios::out | ios::trunc);
+   fstream("Output/Debug/vertices.txt", ios::out | ios::trunc);
+   fstream("Output/Debug/edges.txt", ios::out | ios::trunc);
+
+   // Initialize log4cplus and set properties based on configure file
+   ::log4cplus::initialize();
+
+   // This is to find the absolute path of the home directory log4cplus file
+   string absPath = getenv("HOME");
+   absPath = absPath + "/log4cplus_configure.ini";
+
+   // Checks whether the file is in the home directory
+   // otherwise uses the file in RuntimeFiles
+   if (findFile(absPath)) {
+      ::log4cplus::PropertyConfigurator::doConfigure(absPath);
+   } else {
+      ::log4cplus::PropertyConfigurator::doConfigure("RuntimeFiles/log4cplus_configure.ini");
+   }
+
+   // storing command line arguments as string
+   // required to pass as an argument to setupSimulation
+   string cmdLineArguments;
+   string executableName = argv[0];
+   for (int i = 1; i < argc; i++) {
+      cmdLineArguments = cmdLineArguments + argv[i] + " ";
+   }
+
+   // Creating an instance of core class
+   Core core;
+   return core.runSimulation(executableName, cmdLineArguments);
+};