add debug info

Author: nguyenngodinh

BayesNetGUI.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.6.0, 2018-05-04T20:37:27. -->
+<!-- Written by QtCreator 4.6.0, 2018-05-06T09:08:31. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -190,7 +190,7 @@
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">BayesNetGUI.pro</value>
     <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">/home/nguyennd/workspace/build-BayesNetGUI-Debug</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default"></value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>

README.md

@@ -4,4 +4,6 @@ bayesian network gui tool
 ###### - Graphical creating bayesian network.
 ###### - Inference based on probability, statiscal theory.
 ###### - Learning with complete and uncomplete data.
-##### This version have improvement of speed on infering and learning with algorithm of belief propagation by NguyenND ([email protected])
+##### This version have improvement by NguyenND ([email protected])
+###### - Increase speed on infering and learning with algorithm of belief propagation.
+###### - Can solve the big size of network and loopy graph.

bayesnet.cpp

@@ -436,7 +436,7 @@ void BayesNet::updateMul(vector<uint> eIndice, vector<int> eVals)
                                            mBeliefs, mEvidences);
         for(uint j=0; j<loopCut.size(); j++)
         {
-//            cout << "\tloopCut:" << loopCut.at(j) << endl;
+            cout << "\tloopCut:" << loopCut.at(j) << endl;
             vector<double> bel = bayesNet->getBeliefs().at(loopCut.at(j));
             jointProb *= bel.at(jointIns.at(j));
 

bngraphicsscene.cpp

@@ -26,9 +26,9 @@ void BnGraphicsScene::loadFromText(QString *text)
     double px, py;
     QString label;
 
-    numNodes = 0;
-    strScene >> numNodes;
-    for (uint i = 0; i < numNodes; ++i) {
+    mNumNodes = 0;
+    strScene >> mNumNodes;
+    for (uint i = 0; i < mNumNodes; ++i) {
         strScene >> nodeIndex;
         strScene >> label;
         strScene >> px;
@@ -44,7 +44,7 @@ void BnGraphicsScene::loadFromText(QString *text)
 //        newNode->setIsSelected(false);
         connect(newNode, SIGNAL(nodeDeleted()), this, SLOT(onNodeDeleted()));
         connect(newNode, SIGNAL(positionChanged(QPointF)), this, SIGNAL(nodePositionChanged()));
-        mapBayes.insert(newNode, QList<QBayesEdge*>());
+        mMapBayes.insert(newNode, QList<QBayesEdge*>());
     }
 
     uint nodeIndex1, nodeIndex2;
@@ -65,28 +65,28 @@ void BnGraphicsScene::loadFromText(QString *text)
         connect(parentNode, SIGNAL(nodeDeleted()), newEdge, SLOT(onNodeDeleted()));
         connect(childNode, SIGNAL(nodeDeleted()), newEdge, SLOT(onNodeDeleted()));
         connect(newEdge, SIGNAL(edgeDeleted()), this, SLOT(onEdgeDeleted()));
-        mapBayes[parentNode].append(newEdge);
-        mapBayes[childNode].append(newEdge);
-        listEdges.push_back(newEdge);
+        mMapBayes[parentNode].append(newEdge);
+        mMapBayes[childNode].append(newEdge);
+        mListEdges.push_back(newEdge);
     }
 }
 
 void BnGraphicsScene::clearNetwork()
 {
-    if (!listEdges.isEmpty()) {
-        qDeleteAll(listEdges);
-        listEdges.clear();
+    if (!mListEdges.isEmpty()) {
+        qDeleteAll(mListEdges);
+        mListEdges.clear();
     }
-    if (!mapBayes.isEmpty()) {
-        foreach (auto list, mapBayes.values()) {
+    if (!mMapBayes.isEmpty()) {
+        foreach (auto list, mMapBayes.values()) {
             list.clear();
         }
-        foreach (auto key, mapBayes.keys()) {
+        foreach (auto key, mMapBayes.keys()) {
             delete key;
         }
-        mapBayes.clear();
+        mMapBayes.clear();
     }
-    numNodes = 0;
+    mNumNodes = 0;
     clear();
     clearFocus();
     clearSelection();
@@ -95,7 +95,7 @@ void BnGraphicsScene::clearNetwork()
 BnGraphicsScene::BnGraphicsScene(QObject *parent)
     : QGraphicsScene(parent)
 {
-    numNodes = 0;
+    mNumNodes = 0;
 }
 
 BnGraphicsScene::~BnGraphicsScene()
@@ -135,7 +135,7 @@ QBayesEdge *BnGraphicsScene::getSelectedEdge()
 
 QBayesNode *BnGraphicsScene::getNodeAt(uint index) const
 {
-    foreach (auto node, mapBayes.keys()) {
+    foreach (auto node, mMapBayes.keys()) {
         if (node->getIndex() == index) {
             return node;
         }
@@ -146,19 +146,19 @@ QBayesNode *BnGraphicsScene::getNodeAt(uint index) const
 QString BnGraphicsScene::toString() const
 {
     QString rs = "";
-    rs += QString::number(numNodes);
+    rs += QString::number(mNumNodes);
     rs += "\t";
     rs += "\n";
-    auto listKeys = mapBayes.keys();
+    auto listKeys = mMapBayes.keys();
     qSort(listKeys.begin(), listKeys.end(), PtrLess<QBayesNode>());
     foreach (QBayesNode* node, listKeys) {
         rs += node->toString();
         rs += "\n";
     }
-    rs += QString::number(listEdges.size());
+    rs += QString::number(mListEdges.size());
     rs += "\t";
     rs += "\n";
-    foreach (QBayesEdge* edge, listEdges) {
+    foreach (QBayesEdge* edge, mListEdges) {
         rs += edge->toString();
         rs += "\n";
     }
@@ -171,26 +171,26 @@ void BnGraphicsScene::onNodeDeleted()
     auto dNode = getSelectedNode();
 
     /// delete related edges
-    foreach (QBayesEdge* edge, mapBayes[dNode]) {
-        mapBayes[edge->getParentNode()].removeOne(edge);
-        mapBayes[edge->getChildNode()].removeOne(edge);
-        listEdges.removeOne(edge);
+    foreach (QBayesEdge* edge, mMapBayes[dNode]) {
+        mMapBayes[edge->getParentNode()].removeOne(edge);
+        mMapBayes[edge->getChildNode()].removeOne(edge);
+        mListEdges.removeOne(edge);
         this->removeItem(edge);
     }
-    mapBayes[dNode].clear();
-    mapBayes.remove(dNode);
+    mMapBayes[dNode].clear();
+    mMapBayes.remove(dNode);
     ///
 
     emit nodeDeleted(dNode->getIndex());
 
     /// decrease node's index
     auto index = dNode->getIndex();
-    foreach (QBayesNode* node, mapBayes.keys()) {
+    foreach (QBayesNode* node, mMapBayes.keys()) {
         if (node->getIndex() > index) {
             node->setIndex(node->getIndex()-1);
         }
     }
-    numNodes--;
+    mNumNodes--;
     ///
 
     this->removeItem(dNode);
@@ -200,9 +200,9 @@ void BnGraphicsScene::onNodeDeleted()
 void BnGraphicsScene::onEdgeDeleted()
 {
     auto dEdge = getSelectedEdge();
-    mapBayes[dEdge->getParentNode()].removeOne(dEdge);
-    mapBayes[dEdge->getChildNode()].removeOne(dEdge);
-    listEdges.removeOne(dEdge);
+    mMapBayes[dEdge->getParentNode()].removeOne(dEdge);
+    mMapBayes[dEdge->getChildNode()].removeOne(dEdge);
+    mListEdges.removeOne(dEdge);
     this->removeItem(dEdge);
     auto paIndex = dEdge->getParentNode()->getIndex();
     auto cIndex = dEdge->getChildNode()->getIndex();
@@ -233,7 +233,7 @@ void BnGraphicsScene::mousePressEvent(QGraphicsSceneMouseEvent *event)
         auto parentNode = getSelectedNode();
         if (childNode && parentNode) {
             /// check edge alredy exist
-            foreach (QBayesEdge* edge, mapBayes[parentNode]) {
+            foreach (QBayesEdge* edge, mMapBayes[parentNode]) {
                 if (edge->getChildNode() == childNode) {
                     return;
                 }
@@ -250,14 +250,14 @@ void BnGraphicsScene::mousePressEvent(QGraphicsSceneMouseEvent *event)
 
 void BnGraphicsScene::addNode(QString label, QPointF pos)
 {
-    QBayesNode *newNode = new QBayesNode(numNodes, label);
+    QBayesNode *newNode = new QBayesNode(mNumNodes, label);
     newNode->setPos(pos);
     this->addItem(newNode);
     newNode->setSelected(true);
     connect(newNode, SIGNAL(nodeDeleted()), this, SLOT(onNodeDeleted()));
     connect(newNode, SIGNAL(positionChanged(QPointF)), this, SIGNAL(nodePositionChanged()));
-    mapBayes.insert(newNode, QList<QBayesEdge*>());
-    ++numNodes;
+    mMapBayes.insert(newNode, QList<QBayesEdge*>());
+    ++mNumNodes;
     emit nodeAdded();
 }
 
@@ -272,9 +272,9 @@ void BnGraphicsScene::addEdge(QBayesNode* parentNode, QBayesNode* childNode)
     connect(parentNode, SIGNAL(nodeDeleted()), newEdge, SLOT(onNodeDeleted()));
     connect(childNode, SIGNAL(nodeDeleted()), newEdge, SLOT(onNodeDeleted()));
     connect(newEdge, SIGNAL(edgeDeleted()), this, SLOT(onEdgeDeleted()));
-    mapBayes[parentNode].append(newEdge);
-    mapBayes[childNode].append(newEdge);
-    listEdges.push_back(newEdge);
+    mMapBayes[parentNode].append(newEdge);
+    mMapBayes[childNode].append(newEdge);
+    mListEdges.push_back(newEdge);
     emit edgeAdded(parentNode->getIndex(), childNode->getIndex());
 }
 

bngraphicsscene.h

@@ -56,9 +56,9 @@ public slots:
     void mousePressEvent(QGraphicsSceneMouseEvent *event);
 
 private:
-    uint numNodes;
-    QMap<QBayesNode*, QList<QBayesEdge*>> mapBayes;   /// map each node to all edge related to it
-    QList<QBayesEdge*> listEdges;
+    uint mNumNodes;
+    QMap<QBayesNode*, QList<QBayesEdge*>> mMapBayes;   /// map each node to all edge related to it
+    QList<QBayesEdge*> mListEdges;
 };
 
 #endif // MYGRAPHICSSCENE_H

cptmodel.cpp

@@ -15,7 +15,7 @@
 CptModel::CptModel(QObject* parent)
     : QAbstractTableModel(parent)
 {
-    values = nullptr;
+    mValues = nullptr;
     initValues(1, 2, 0);
 }
 
@@ -26,10 +26,10 @@ QVariant CptModel::data(const QModelIndex &index, int role) const
     if (index.isValid())
     {
         if (role == Qt::DisplayRole) {
-            return values[row][col];
+            return mValues[row][col];
         } else if (role == Qt::TextAlignmentRole) {
             return Qt::AlignCenter;
-        } else if (role == Qt::BackgroundRole && col < nparents) {
+        } else if (role == Qt::BackgroundRole && col < mNodeparents) {
             return QColor(180,255,255);
         }
     }
@@ -43,13 +43,13 @@ bool CptModel::setData(const QModelIndex &index, const QVariant &value, int role
             return false;
         }
         double newValue = value.toDouble();
-        if (newValue == values[index.row()][index.column()] || index.column() < nparents) {
+        if (newValue == mValues[index.row()][index.column()] || index.column() < mNodeparents) {
             return false;
         }
-        values[index.row()][index.column()] = newValue;
-        if (ncolumns-nparents == 2)
+        mValues[index.row()][index.column()] = newValue;
+        if (mNColumns-mNodeparents == 2)
         {
-            values[index.row()][ncolumns-1-(index.column()-nparents)] = 1 - newValue;
+            mValues[index.row()][mNColumns-1-(index.column()-mNodeparents)] = 1 - newValue;
         }
         emit dataChanged(index, index);
         return true;
@@ -85,14 +85,14 @@ QVariant CptModel::headerData(int section, Qt::Orientation orientation, int role
     if (role == Qt::DisplayRole) {
         if (orientation == Qt::Horizontal)
         {
-            if(section >=0 && section < headers.count())
-                return headers[section];
+            if(section >=0 && section < mHeaders.count())
+                return mHeaders[section];
         }
     } else if (role == Qt::TextAlignmentRole) {
         return Qt::AlignCenter;
     } else if (role == Qt::BackgroundRole) {
         if (orientation == Qt::Horizontal) {
-            if (section < nparents) {
+            if (section < mNodeparents) {
                 return QColor(120,210,210);
             } else {
                 return QColor(150,150,250);
@@ -104,12 +104,12 @@ QVariant CptModel::headerData(int section, Qt::Orientation orientation, int role
 
 int CptModel::rowCount(const QModelIndex &parent) const
 {
-    return nrows;
+    return mNRows;
 }
 
 int CptModel::columnCount(const QModelIndex &parent) const
 {
-    return ncolumns;
+    return mNColumns;
 }
 
 bool CptModel::insertRows(int row, int count, const QModelIndex &parent)
@@ -140,15 +140,15 @@ void CptModel::initValues(int nrows, int ncolumns, int nparents)
     clear();
     ///
 
-    this->nrows = nrows;
-    this->ncolumns = ncolumns;
-    this->nparents = nparents;
-    values = new double*[nrows];
+    this->mNRows = nrows;
+    this->mNColumns = ncolumns;
+    this->mNodeparents = nparents;
+    mValues = new double*[nrows];
     for (int i = 0; i < nrows; ++i) {
-        values[i] = new double[ncolumns];
+        mValues[i] = new double[ncolumns];
         for (int j = 0; j < ncolumns; ++j) {
-            values[i][j] = 0;
-//            values[i][j] = 1.0 / ncolumns;
+            mValues[i][j] = 0;
+//            mValues[i][j] = 1.0 / mNColumns;
         }
 //        values[i][0] = 1;
     }    
@@ -157,32 +157,32 @@ void CptModel::initValues(int nrows, int ncolumns, int nparents)
 
 void CptModel::setValue(int row, int column, double value)
 {
-    values[row][column] = value;
+    mValues[row][column] = value;
 }
 
 double CptModel::getValue(int row, int column)
 {
-    if (0 <= row && row < nrows && 0 <= column && column < ncolumns)
-        return values[row][column];
+    if (0 <= row && row < mNRows && 0 <= column && column < mNColumns)
+        return mValues[row][column];
     else
         return 0;
 }
 
 void CptModel::setHeader(int column, QString value)
 {
-    headers.insert(column, value);
+    mHeaders.insert(column, value);
 }
 
 void CptModel::clear()
 {
-    if (values) {
-        for (int i = 0; i < this->nrows; ++i) {
-            delete values[i];
-            values[i] = nullptr;
+    if (mValues) {
+        for (int i = 0; i < this->mNRows; ++i) {
+            delete mValues[i];
+            mValues[i] = nullptr;
         }
-        delete values;
-        values = nullptr;
+        delete mValues;
+        mValues = nullptr;
     }
-    headers.clear();
-    nrows = ncolumns = nparents = 0;
+    mHeaders.clear();
+    mNRows = mNColumns = mNodeparents = 0;
 }