Revert "KNF Darstellung im KV diagramm"

This reverts commit 17c246a3cc.

GDE_3_2008/GDE_3.vcxproj

@@ -28,7 +28,7 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

GDE_3_2008/res/input8-KNF.txt

@@ -1,3 +0,0 @@
-Variables: a, b, c, d  , e , f, g, h
-Terms:
-"xx01xx01">0

GDE_3_2008/res/input8.txt

@@ -1,3 +0,0 @@
-Variables: a, b, c, d  , e , f, g, h
-Terms:
-"xx01xx01">1

GDE_3_2008/res/listParser.txt

@@ -0,0 +1,26 @@
+    1 Variables: a,Variable a
+ bar,Variable bar
+ char,Variable char
+ d
+Variable d
+    2 Terms:
+
+    3 "0010"Term Key 0010
+>1
+Term Value 1
+
+    4 7>Term Key 7
+1
+Term Value 1
+
+    5 14>Term Key 14
+1
+Term Value 1
+
+    6 "01xx"Term Key 01xx
+>1
+Term Value 1
+
+    7 "x000"Term Key x000
+>1Term Value 1
+

Hazard/Hazard/Cell.cpp

@@ -7,7 +7,6 @@
 using namespace std;
 
 extern uint dimension;
-extern bool KNF;
 
 void Cell::refresh(PrimImplikantCollection* &globalPIC)
 {
@@ -35,12 +34,10 @@ vector<Cell*>* Cell::getHazards(vector<Cell*> &allCells)
 
 	for (vector<Cell*>::iterator neighbor = neighbors->begin(); neighbor < neighbors->end(); neighbor++)
 	{
-		
-			if ((*neighbor)->value == KNF)
-				continue;
-			if ((*neighbor)->hasOneOfThose(this->primImplikanten) == false)
-				hazardous->push_back(*neighbor);
-		
+		if ((*neighbor)->value == false)
+			continue;
+		if ((*neighbor)->hasOneOfThose(this->primImplikanten) == false)
+			hazardous->push_back(*neighbor);
 	}
 
 	delete neighbors;

Hazard/Hazard/Cell.h

@@ -3,7 +3,6 @@
 #include "PrimImplikantCollection.h"
 
 using namespace std;
-extern bool KNF;
 
 #ifndef CELL
 #define CELL
@@ -22,7 +21,7 @@ public:
 	{
 		this->index = index;
 		this->refresh(globalPIC);
-		this->value = (this->primImplikanten.size() > 0) ^ KNF;
+		this->value = this->primImplikanten.size() > 0;
 	}
 
 	PrimImplikantCollection primImplikanten;

Hazard/Hazard/CellCollection.cpp

@@ -30,7 +30,7 @@ void CellCollection::findHazards()
 		uint I = i ^ (i/2);									// transform to gray code --> Schachbrettmuster
 		Cell* currentCell = cells[I];						// this is the cell we are currently checking
 
-		if (currentCell->value == KNF)					// no hazard can occur
+		if (currentCell->value == false)					// no hazard can occur
 			continue;
 
 		cout << "   Checking cell " << I << endl;

Hazard/Hazard/Tools.cpp

@@ -28,7 +28,7 @@ uint Tools::GrayToBinary(uint x)
 	char r = 0;						// r = ceil(ld(x))
 	do
 		r++;
-	while (x1 >>= 1); // x1=x1>>1
+	while (x1 >>= 1);
 
 	if ((r & (r-1)) != 0)			// keine Potenz von 2
 	{