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

KV-Diagramm im Hauptprogramm eingefügt

Browse source 
Vor und nach Hazard-Detection.
Vielleicht können wir die Hazards noch einzeichen? =)
This commit is contained in:
Jonny007-MKD 2013-11-29 01:55:07 +01:00
parent 70a412a2b7
commit c5565b1f0b
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Hazard/Hazard/Hazard.cpp
View file

@ -10,6 +10,7 @@
#include "PrimImplikantCollection.h" #include "PrimImplikantCollection.h"
#include "Cell.h" #include "Cell.h"
#include "Wertetabelle.h" #include "Wertetabelle.h"
#include "KV.h"
using namespace std; using namespace std;
@ -55,7 +56,10 @@ void user_main(void)
system("pause"); system("pause");
return; return;
} }
system("pause"); fclose(input);
fclose(error);
fclose(list);
//system("pause");
/*pic.add(7); /*pic.add(7);
pic.add("0x1"); pic.add("0x1");
@ -94,7 +98,10 @@ void user_main(void)
Wertetabelle* wt = new Wertetabelle(&cells, variables); Wertetabelle* wt = new Wertetabelle(&cells, variables);
wt->Print(); wt->Print();
delete wt; delete wt;
system("pause");
KV* kv = new KV(globalPIC, cells, 30);
kv->Print(30);
//system("pause");
// find hazards // find hazards
@ -124,13 +131,16 @@ void user_main(void)
currentCell->refresh(globalPIC); currentCell->refresh(globalPIC);
delete hazardousNeighbors; delete hazardousNeighbors;
} }
system("pause"); //system("pause");
wt = new Wertetabelle(&cells, variables); wt = new Wertetabelle(&cells, variables);
wt->Print(); wt->Print();
delete wt; delete wt;
kv->Print(30*2 + kv->width(), 30);
delete kv;
globalPIC->Dispose(); globalPIC->Dispose();
system("pause"); //system("pause");
return; return;
} }