From c5565b1f0b5fa6a6c5702f703afd36f176392e4d Mon Sep 17 00:00:00 2001 From: Jonny007-MKD <1-23-4-5@web.de> Date: Fri, 29 Nov 2013 01:55:07 +0100 Subject: [PATCH] =?UTF-8?q?KV-Diagramm=20im=20Hauptprogramm=20eingef=C3=BC?= =?UTF-8?q?gt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Vor und nach Hazard-Detection. Vielleicht können wir die Hazards noch einzeichen? =) --- Hazard/Hazard/Hazard.cpp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/Hazard/Hazard/Hazard.cpp b/Hazard/Hazard/Hazard.cpp index f3ef48f..1383546 100644 --- a/Hazard/Hazard/Hazard.cpp +++ b/Hazard/Hazard/Hazard.cpp @@ -10,6 +10,7 @@ #include "PrimImplikantCollection.h" #include "Cell.h" #include "Wertetabelle.h" +#include "KV.h" using namespace std; @@ -55,7 +56,10 @@ void user_main(void) system("pause"); return; } - system("pause"); + fclose(input); + fclose(error); + fclose(list); + //system("pause"); /*pic.add(7); pic.add("0x1"); @@ -94,7 +98,10 @@ void user_main(void) Wertetabelle* wt = new Wertetabelle(&cells, variables); wt->Print(); delete wt; - system("pause"); + + KV* kv = new KV(globalPIC, cells, 30); + kv->Print(30); + //system("pause"); // find hazards @@ -124,13 +131,16 @@ void user_main(void) currentCell->refresh(globalPIC); delete hazardousNeighbors; } - system("pause"); + //system("pause"); wt = new Wertetabelle(&cells, variables); wt->Print(); delete wt; + kv->Print(30*2 + kv->width(), 30); + delete kv; + globalPIC->Dispose(); - system("pause"); + //system("pause"); return; } \ No newline at end of file