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

Revert "KNF Darstellung im KV diagramm"

Browse source 
This reverts commit 17c246a3cc.
This commit is contained in:
Jonny007-MKD 2014-01-07 17:49:38 +01:00
parent 17c246a3cc
commit d709a33fe9
8 changed files with 34 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
GDE_3_2008/GDE_3.vcxproj
View file

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

3
GDE_3_2008/res/input8-KNF.txt
View file

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

3
GDE_3_2008/res/input8.txt
View file

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

26
GDE_3_2008/res/listParser.txt
View file

@ -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

11
Hazard/Hazard/Cell.cpp
View file

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

3
Hazard/Hazard/Cell.h
View file

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

2
Hazard/Hazard/CellCollection.cpp
View file

@ -30,7 +30,7 @@ void CellCollection::findHazards()
uint I = i ^ (i/2); // transform to gray code --> Schachbrettmuster uint I = i ^ (i/2); // transform to gray code --> Schachbrettmuster
Cell* currentCell = cells[I]; // this is the cell we are currently checking 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; continue;
cout << " Checking cell " << I << endl; cout << " Checking cell " << I << endl;

2
Hazard/Hazard/Tools.cpp
View file

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