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

Print Implikant algoritmus geschrieben aber. funktionniert. Keine Fehler

Browse source 
bei der Compilierung aber die Kuller auftreten nicht
This commit is contained in:
gaeltp3 2013-12-23 02:51:37 +01:00
parent aeb5cbfe34
commit 10269bcd65
4 changed files with 114 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
Hazard/Hazard/KV.cpp
View file

@ -9,6 +9,8 @@ extern uint dimension;
extern uint numElements; extern uint numElements;
extern bool KNF; extern bool KNF;
using namespace std;
void KV::Clear() void KV::Clear()
{ {
@ -162,7 +164,7 @@ void KV::PrintCellValues() // Erstellt die Werte der jeweiligen Zellen: ▯▯
void KV::PrintPrimImplikanten() void KV::PrintPrimImplikanten()
{ {
srand(time(NULL)+rand()); srand(time(NULL) + rand());
for (uint i = 0; i < this->globalPic->size(); i++) for (uint i = 0; i < this->globalPic->size(); i++)
{ {
PrimImplikant* currentPI = this->globalPic->at(i); PrimImplikant* currentPI = this->globalPic->at(i);
@ -170,35 +172,35 @@ void KV::PrintPrimImplikanten()
/*uint overflow = 0; // at which sides the PrimImplikant overlaps /*uint overflow = 0; // at which sides the PrimImplikant overlaps
for (uint j = 0; j < currentPI->implikanten.size(); j++) for (uint j = 0; j < currentPI->implikanten.size(); j++)
{ {
uint currentI = currentPI->implikanten[j]; uint currentI = currentPI->implikanten[j];
uint w = (currentI & ((0x1 << (this->numVarX)) - 1)); // get all bits that make X (=w) uint w = (currentI & ((0x1 << (this->numVarX)) - 1)); // get all bits that make X (=w)
w ^= w / 2; w ^= w / 2;
uint h = (currentI >> this->numVarX); // get all bits that make Y (=h) uint h = (currentI >> this->numVarX); // get all bits that make Y (=h)
h ^= h / 2; h ^= h / 2;
if (w == 0) if (w == 0)
overflow |= 0x1; // left side overflow |= 0x1; // left side
else if (w == this->numFieldX - 1) else if (w == this->numFieldX - 1)
overflow |= 0x2; // right side overflow |= 0x2; // right side
else else
overflow |= 0x4; overflow |= 0x4;
if (h == 0) if (h == 0)
overflow |= 0x10; // upper side overflow |= 0x10; // upper side
else if (h == this->numFieldY - 1) else if (h == this->numFieldY - 1)
overflow |= 0x20; // lower side overflow |= 0x20; // lower side
else else
overflow |= 0x40; overflow |= 0x40;
} }
switch (overflow) switch (overflow)
{ {
case 0x33: // all 4 edges case 0x33: // all 4 edges
break; break;
case 0x30: // overflows from top to bottom case 0x30: // overflows from top to bottom
break; break;
case 0x03: // overflows from left to right case 0x03: // overflows from left to right
break; break;
default: default:
*/ */
@ -207,24 +209,70 @@ void KV::PrintPrimImplikanten()
uint X1 = -1, X2 = 0, Y1 = -1, Y2 = 0; // find coordinates for Rechteck // uint X1 = -1, X2 = 0, Y1 = -1, Y2 = 0; // find coordinates for Rechteck
for (uint j = 0; j < currentPI->PI_groupCollection.size(); j++)
for (uint j = 0; j < currentPI->PI_groupCollection.size(); j++)
{
vector<Implikant_localisation*>* kullers = currentPI->PI_groupCollection[j];
for (uint k = 0; k < kullers->size(); k++)
{ {
vector<Implikant_localisation*>* kuller = currentPI->PI_groupCollection[j];
for (uint j = 0; j < kuller->size(); j++) for (vector<Implikant_localisation*>::iterator it = kullers->begin(); it < kullers->end(); it++)
{ {
uint x1 = (*kuller)->w * (this->edgeLength + 1) + this->VarY_Length; // Upper coord uint X1 = -1, X2 = 0, Y1 = -1, Y2 = 0;
uint x1 = (*it)->w * (this->edgeLength + 1) + this->VarY_Length; // Upper coord
uint x2 = x1 + this->edgeLength; // Lower coord uint x2 = x1 + this->edgeLength; // Lower coord
uint y1 = h * (this->edgeLength + 1) + this->VarX_Length; // Left coord uint y1 = (*it)->h * (this->edgeLength + 1) + this->VarX_Length; // Left coord
uint y2 = y1 + this->edgeLength; // Right coo uint y2 = y1 + this->edgeLength; // Right coo
X1 = min(X1, x1); X1 = min(X1, x1);
X2 = max(X2, x2); X2 = max(X2, x2);
Y1 = min(Y1, y1); Y1 = min(Y1, y1);
Y2 = max(Y2, y2); Y2 = max(Y2, y2);
if (currentPI->name.find("|") != string::npos)
{
this->Rechteck(X1 + 12, Y1 + 9, X2 - 12, Y2 - 9, RED, TRANS);
}
else
{
uint random = rand() % 10;
X1 += random;
X2 -= random;
Y1 += random;
Y2 -= random;
if (currentPI->implikanten.size() == 1)
this->Rechteck(X1, Y1, X2, Y2, GREEN, TRANS);
else
this->Rechteck(X1, Y1, X2, Y2, BLUE, TRANS);
}
} }
}
}
}
}
/*
uint w = currentPI->PI_groupCollection // get all bits that make X (=w) uint w = currentPI->PI_groupCollection // get all bits that make X (=w)
w ^= w / 2; w ^= w / 2;
uint h = (currentI >> this->numVarX); // get all bits that make Y (=h) uint h = (currentI >> this->numVarX); // get all bits that make Y (=h)
@ -264,7 +312,7 @@ void KV::PrintPrimImplikanten()
//------------------------------------------------------------------ //------------------------------------------------------------------
*/

1
Hazard/Hazard/PrimImplikant.h
View file

@ -47,6 +47,7 @@ public:
vector<uint> implikanten; vector<uint> implikanten;
vector<Implikant_localisation*> I_Vector; vector<Implikant_localisation*> I_Vector;
vector<vector<Implikant_localisation*>*> PI_groupCollection; vector<vector<Implikant_localisation*>*> PI_groupCollection;

54
Hazard/Hazard/PrimImplikantCollection.cpp
View file

@ -15,21 +15,21 @@ void PrimImplikantCollection::add(string input)
PrimImplikant* PI = new PrimImplikant(input); PrimImplikant* PI = new PrimImplikant(input);
PI->id = this->size(); PI->id = this->size();
setgroupCollection1(PI); this->setgroupCollection1(PI);
this->add(PI); this->add(PI);
} }
void PrimImplikantCollection::add(uint input) void PrimImplikantCollection::add(uint input)
{ {
PrimImplikant* PI = new PrimImplikant(input); PrimImplikant* PI = new PrimImplikant(input);
PI->id = this->size(); PI->id = this->size();
setgroupCollection1(PI); this->setgroupCollection1(PI);
this->add(PI); this->add(PI);
} }
void PrimImplikantCollection::add(uint input1, uint input2) void PrimImplikantCollection::add(uint input1, uint input2)
{ {
PrimImplikant* PI = new PrimImplikant(input1, input2); PrimImplikant* PI = new PrimImplikant(input1, input2);
PI->id = this->size(); PI->id = this->size();
setgroupCollection1(PI); this->setgroupCollection1(PI);
this->add(PI); this->add(PI);
} }
@ -81,11 +81,13 @@ void PrimImplikantCollection::setgroupCollection1(PrimImplikant* &currentPI)
static int Linie_mitte; static int Linie_mitte;
uint numVarY = (uint)ceil(dimension / 2.0f); uint numVarY = (uint)ceil(dimension / 2.0f);
//PrimImplikant* currentPI = currentPI; // Zuweisung diese Adresse an einem ZeigerObjekt denselben Namen.
for (it1 = currentPI->I_Vector.begin(); it1 < currentPI->I_Vector.end(); it1++) for (it1 = currentPI->I_Vector.begin(); it1 < currentPI->I_Vector.end(); it1++)
{ {
if ((((*it1)->h) = (numVarY / 2) - 1) || (((*it1)->h) = (numVarY / 2))) if ((((*it1)->h) == (numVarY / 2) - 1) || (((*it1)->h) == (numVarY / 2)))
{ {
Linie_mitte++; // test zu wissen ob die MitteLinie h der KV diagramm erreicht ist. Linie_mitte++; // test zu wissen ob die MitteLinie h der KV diagramm erreicht ist.
// Test zu wissen , wieviele Implikanten in Mitte_tiefe sind // Test zu wissen , wieviele Implikanten in Mitte_tiefe sind
@ -121,32 +123,40 @@ void PrimImplikantCollection::setgroupCollection1(PrimImplikant* &currentPI)
} }
setgroupCollection2(currentPI,groupA); if (groupA.size())
setgroupCollection2(currentPI,groupB); {
setgroupCollection2(currentPI, groupA);
}
if (groupB.size())
{
setgroupCollection2(currentPI, groupB);
}
} }
} }
void PrimImplikantCollection::setgroupCollection2(PrimImplikant* &currentPI, vector<Implikant_localisation*>&group) void PrimImplikantCollection::setgroupCollection2(PrimImplikant* &currentPI, vector<Implikant_localisation*> &group)
{ {
vector<Implikant_localisation*> hilfVec1, hilfVec2; vector<Implikant_localisation*> hilfVec1, hilfVec2;
vector<Implikant_localisation*>::iterator it1; vector<Implikant_localisation*>::iterator it1;
uint numVarX = (uint)floor(dimension / 2.0f); uint numVarX = (uint)floor(dimension / 2.0f);
static int Linie_mitte; // Zustand 0--> wird h überprüft im Vector static int Linie_mitte; // Zustand 0--> wird w überprüft im Vector
// Zustand 1-->wird w überprüft im Vector. // Zustand 1 oder >1 -->wird w überprüft im Vector.
// Ohne Zuweisung hat schalter am Anfang den Wert 0
for (it1 = group.begin(); it1 < group.end(); it1++) for (it1 = group.begin(); it1 < group.end(); it1++)
{ {
if ((((*it1)->h) = (numVarX / 2) - 1) || (((*it1)->h) = (numVarX / 2))) if ((((*it1)->h) == (numVarX / 2) - 1) || (((*it1)->h) == (numVarX / 2)))
{ {
Linie_mitte++; // test zu wissen ob die MitteLinie h der KV diagramm erreicht ist. Linie_mitte++; // test zu wissen ob die MitteLinie w der KV diagramm erreicht ist.
// Test zu wissen , wieviele Implikanten in Mitte_tiefe sind // Test zu wissen , wieviele Implikanten in Mitte_tiefe sind
//schalter = 1;
} }
continue; continue;
} }
@ -162,8 +172,8 @@ void PrimImplikantCollection::setgroupCollection2(PrimImplikant* &currentPI, vec
for (it1 = group.begin(); it1 < group.end(); it1++) for (it1 = group.begin(); it1 < group.end(); it1++)
{ {
if (((*it1)->w < (numVarX / 2) - 1)) // die Implikanten, deren h <= numVary/2 -1 sind im groupA if (((*it1)->w < (numVarX / 2) - 1)) // die Implikanten, deren w <= numVarX/2 -1 sind im groupA
{ // gespeichert. { // gespeichert. wenn w größer, dann wird im hilfVec2 gespeichert
hilfVec1.push_back(*it1); hilfVec1.push_back(*it1);
@ -174,8 +184,16 @@ void PrimImplikantCollection::setgroupCollection2(PrimImplikant* &currentPI, vec
} }
currentPI->PI_groupCollection.push_back(&hilfVec1); if (hilfVec1.size())
currentPI->PI_groupCollection.push_back(&hilfVec2); {
currentPI->PI_groupCollection.push_back(&hilfVec1);
}
if (hilfVec2.size())
{
currentPI->PI_groupCollection.push_back(&hilfVec2);
}
} }
} }

2
Hazard/Hazard/PrimImplikantCollection.h
View file

@ -23,7 +23,7 @@ public:
PrimImplikantCollection primImplikantenAt(uint position); PrimImplikantCollection primImplikantenAt(uint position);
bool contains(PrimImplikant* foreign); bool contains(PrimImplikant* foreign);
void setgroupCollection1(PrimImplikant* &currentPI); void setgroupCollection1(PrimImplikant* &currentPI);
void setgroupCollection2(PrimImplikant* &currentPI,vector<Implikant_localisation*>&group); void setgroupCollection2(PrimImplikant* &currentPI,vector<Implikant_localisation*> &group);
bool Anwesenheit(Implikant_localisation* &I, vector<Implikant_localisation*> &group); bool Anwesenheit(Implikant_localisation* &I, vector<Implikant_localisation*> &group);
void Dispose(); void Dispose();