Jonny007-MKD/NB6_Hazards
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Supress 2nd Wertetabelle if no hazard was found

Browse source
This commit is contained in:
Jonny007-MKD 2014-01-07 20:28:09 +01:00
parent 1325c11caa
commit e1614a62e6
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Hazard/Hazard/CellCollection.cpp
View file

@ -47,6 +47,7 @@ void CellCollection::findHazards()
printf("Hazard found! Cell %d <--> Cell %d\n", I, (*nc)->index); printf("Hazard found! Cell %d <--> Cell %d\n", I, (*nc)->index);
this->globalPIC->add(I, (*nc)->index); // add PI that solves hazard. Not quite smart... this->globalPIC->add(I, (*nc)->index); // add PI that solves hazard. Not quite smart...
(*nc)->refresh(this->globalPIC); // refresh the foreign PIC (a PI was added) (*nc)->refresh(this->globalPIC); // refresh the foreign PIC (a PI was added)
this->hazardsFound = true;
} }
currentCell->refresh(this->globalPIC); // refresh the current PIC (a PI was added) currentCell->refresh(this->globalPIC); // refresh the current PIC (a PI was added)
delete hazardousNeighbors; delete hazardousNeighbors;

2
Hazard/Hazard/CellCollection.h
View file

@ -27,11 +27,13 @@ public:
CellCollection(PrimImplikantCollection* &globalPIC) CellCollection(PrimImplikantCollection* &globalPIC)
{ {
this->init(globalPIC); this->init(globalPIC);
this->hazardsFound = false;
}; };
vector<Cell*> cells; vector<Cell*> cells;
PrimImplikantCollection* globalPIC; PrimImplikantCollection* globalPIC;
bool hazardsFound;
}; };
#endif #endif

7
Hazard/Hazard/Hazard.cpp
View file

@ -161,9 +161,10 @@ void user_main(void)
// find and solve Hazards // find and solve Hazards
allCells->findHazards(); allCells->findHazards();
// print Wertetabelle and KV of corrected data if (allCells->hazardsFound)
wt->Print(); // print Wertetabelle and KV of corrected data
wt->Print();
kv->Print(30 + kv->width() + 30, 30); // Diagramm neben dem vorherigen kv->Print(30 + kv->width() + 30, 30); // Diagramm neben dem vorherigen