fix blifexplorer not creating directory for simulation

Author: jeanlego

ODIN_II/.gitignore

@@ -1,2 +1,3 @@
 regression_test/runs
-OUTPUT/*
+OUTPUT/*
+temp

blifexplorer/.gitignore

@@ -0,0 +1 @@
+OUTPUT

blifexplorer/src/container.cpp

@@ -973,21 +973,6 @@ void Container::showSimulationStep(int cycle)
     //actSimStep = (simOffset+1)%64;
 }
 
-/*---------------------------------------------------------------------------------------------
- * (function: setEdge)
- *-------------------------------------------------------------------------------------------*/
-void Container::setEdge(int i)
-{
-    if(odinStarted)
-    {
-        myOdin->setEdge(i);
-    }
-    else
-    {
-        std::cout << "unable to set edge since odin has not been started";
-    }
-}
-
 /*---------------------------------------------------------------------------------------------
  * (function: getConnectionBetween)
  *-------------------------------------------------------------------------------------------*/

blifexplorer/src/container.h

@@ -53,7 +53,6 @@ class Container
     int getActSimStep();
     int startSimulator();
     void showSimulationStep(int cycle);
-    void setEdge(int i);
     int simulateNextWave();
     void resetAllHighlights();
     void showActivity();

blifexplorer/src/mainwindow.cpp

@@ -469,25 +469,6 @@ void MainWindow::createToolBox()
                 ":/images/next.png"), 2, 0);
 
 
-    //add edge control for the simulation
-    edgeRadioLayout = new QVBoxLayout;
-    QGroupBox* groupBox = new QGroupBox(tr("Show Edge"));
-    QRadioButton* radFall = new QRadioButton(tr("F"));
-    QRadioButton* radRise = new QRadioButton(tr("R"));
-    QRadioButton* radFallRise = new QRadioButton(tr("RF"));
-    radFallRise->setChecked(true);
-    edgeRadioLayout->addWidget(radFall);
-    edgeRadioLayout->addWidget(radRise);
-    edgeRadioLayout->addWidget(radFallRise);
-    groupBox->setLayout(edgeRadioLayout);
-    simulationLayout->addWidget(groupBox,3,0);
-    connect(radFall, SIGNAL(toggled(bool)),
-        this, SLOT(setEdgeFall(bool)));
-    connect(radRise, SIGNAL(toggled(bool)),
-        this, SLOT(setEdgeRise(bool)));
-    connect(radFallRise, SIGNAL(toggled(bool)),
-        this, SLOT(setEdgeFallRise(bool)));
-
     QLabel* legend = new QLabel();
     QSize size(100,100);
     QPixmap* pixmap = new QPixmap(size);
@@ -1308,33 +1289,6 @@ QWidget * MainWindow::createPowerCellWidget(const QString &text, const QString &
     return widget;
 }
 
-/*---------------------------------------------------------------------------------------------
- * (function: setEdgeFall)
- *-------------------------------------------------------------------------------------------*/
-void MainWindow::setEdgeFall(bool val){
-    if(val){
-        myContainer->setEdge(1);
-    }
-}
-
-/*---------------------------------------------------------------------------------------------
- * (function: setEdgeRise)
- *-------------------------------------------------------------------------------------------*/
-void MainWindow::setEdgeRise(bool val){
-    if(val){
-        myContainer->setEdge(0);
-    }
-}
-
-/*---------------------------------------------------------------------------------------------
- * (function: setEdgeFallRise)
- *-------------------------------------------------------------------------------------------*/
-void MainWindow::setEdgeFallRise(bool val){
-    if(val){
-        myContainer->setEdge(-1);
-    }
-}
-
 void MainWindow::activityCycleCountChangedChanged(int number)
 {
     activityBase = number;

blifexplorer/src/mainwindow.h

@@ -93,10 +93,6 @@ private slots:
     void showRelevantGraph();
     void expandCollapse();
 
-    void setEdgeFall(bool);
-    void setEdgeRise(bool);
-    void setEdgeFallRise(bool);
-
 private:
     void createToolBox();
     void createActions();
@@ -178,7 +174,6 @@ private slots:
 
     QGridLayout *simStatLayout;
     QLabel* simstatLabel;
-    QVBoxLayout* edgeRadioLayout;
 
     Container* myContainer;
 

blifexplorer/src/odininterface.cpp

@@ -25,13 +25,13 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "odin_ii.h"
 #include "vtr_memory.h"
 #include "vtr_util.h"
+#include <QDir>
 
 
 OdinInterface::OdinInterface()
 {
     fprintf(stderr,"Creating Odin II object\n");
     wave = 0;
-    edge_output = "";
 	blifexplorer_netlist = NULL;
 	arg_list = NULL;
     arg_len = 0;
@@ -42,21 +42,23 @@ OdinInterface::OdinInterface()
  *-------------------------------------------------------------------------------------------*/
 int OdinInterface::startOdin()
 {
+    std::string simulation_directory = "OUTPUT";
+    QString dir_name(simulation_directory.c_str());
+    QDir dir(dir_name);
+    if (!dir.exists())
+        dir.mkpath(dir_name);
+
     /* pass arguments here to odin */
     std::vector<std::string> arguments = 
 	{
 		"../ODIN_II/odin_ii", 												//	pass the odin location relative to blifexplorer
 		"--interractive_simulation",										//	prevent odin from freeing valuable information
         "-r", "7",															//	set simulation seed
-        "-sim_dir", "./OUTPUT/",												//	set simulation directory
+        "-sim_dir", std::string(simulation_directory + "/"),												//	set simulation directory
         "-g", "10000",														//	set number of test vector
 		"-b", OdinInterface::myFilename.trimmed().toLocal8Bit().data()		//	pass the blif file
     };
 
-	// pass the edge type
-    if ( OdinInterface::edge_output != "" )
-        arguments.insert(arguments.end(), OdinInterface::edge_output);
-
     /* converting into format digestible by odin */
     arg_list = (char**)malloc(arguments.size()*sizeof(char*));
 	arg_len = arguments.size();
@@ -173,16 +175,4 @@ int OdinInterface::getOutputValue(nnode_t* node, int outPin, int actstep)
     return get_pin_value(node->output_pins[outPin],actstep);
 }
 
-/*---------------------------------------------------------------------------------------------
- * (function: setEdge)
- *-------------------------------------------------------------------------------------------*/
-void OdinInterface::setEdge(int i ){
-    if(i==-1)
-        OdinInterface::edge_output = "-E";
-    else if(i==0)
-        OdinInterface::edge_output = "-R";
-    else
-        OdinInterface::edge_output = "";
-}
-
 

blifexplorer/src/odininterface.h

@@ -53,15 +53,13 @@ class OdinInterface
     int simulateNextWave();
     void endSimulation();
     int getOutputValue(nnode_t* node, int pin, int actstep);
-    void setEdge(int i);
     netlist_t *blifexplorer_netlist;
 
 private:
     QHash<QString, nnode_t *> nodehash;
     QQueue<nnode_t *> nodequeue;
     QString myFilename;
     sim_data_t *sim_data;
-    std::string edge_output;
     char **arg_list;
     int arg_len;
     int wave;