New inputs: 8, 12
This commit is contained in:
		
							parent
							
								
									69ff2466ff
								
							
						
					
					
						commit
						fcc34a9fa2
					
				
					 6 changed files with 44 additions and 4 deletions
				
			
		| 
						 | 
				
			
			@ -167,7 +167,15 @@
 | 
			
		|||
    <None Include="res\GDE_3.ico" />
 | 
			
		||||
    <None Include="res\GDE_3.rc2" />
 | 
			
		||||
    <None Include="res\GDE_3Doc.ico" />
 | 
			
		||||
    <None Include="res\input-sort.txt" />
 | 
			
		||||
    <None Include="res\input.txt" />
 | 
			
		||||
    <None Include="res\input12.txt" />
 | 
			
		||||
    <None Include="res\input2.txt" />
 | 
			
		||||
    <None Include="res\input4-KNF.txt" />
 | 
			
		||||
    <None Include="res\input4.txt" />
 | 
			
		||||
    <None Include="res\input6.txt" />
 | 
			
		||||
    <None Include="res\input8-KNF.txt" />
 | 
			
		||||
    <None Include="res\input8.txt" />
 | 
			
		||||
    <None Include="res\Toolbar.bmp" />
 | 
			
		||||
    <None Include="ReadMe.txt" />
 | 
			
		||||
  </ItemGroup>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -150,7 +150,7 @@
 | 
			
		|||
      <Filter>Headerdateien</Filter>
 | 
			
		||||
    </ClInclude>
 | 
			
		||||
    <ClInclude Include="..\Hazard\Hazard\Tools.h">
 | 
			
		||||
      <Filter>Quelldateien</Filter>
 | 
			
		||||
      <Filter>Headerdateien</Filter>
 | 
			
		||||
    </ClInclude>
 | 
			
		||||
  </ItemGroup>
 | 
			
		||||
  <ItemGroup>
 | 
			
		||||
| 
						 | 
				
			
			@ -170,6 +170,30 @@
 | 
			
		|||
    <None Include="res\input.txt">
 | 
			
		||||
      <Filter>Ressourcendateien</Filter>
 | 
			
		||||
    </None>
 | 
			
		||||
    <None Include="res\input2.txt">
 | 
			
		||||
      <Filter>Ressourcendateien</Filter>
 | 
			
		||||
    </None>
 | 
			
		||||
    <None Include="res\input4.txt">
 | 
			
		||||
      <Filter>Ressourcendateien</Filter>
 | 
			
		||||
    </None>
 | 
			
		||||
    <None Include="res\input4-KNF.txt">
 | 
			
		||||
      <Filter>Ressourcendateien</Filter>
 | 
			
		||||
    </None>
 | 
			
		||||
    <None Include="res\input6.txt">
 | 
			
		||||
      <Filter>Ressourcendateien</Filter>
 | 
			
		||||
    </None>
 | 
			
		||||
    <None Include="res\input-sort.txt">
 | 
			
		||||
      <Filter>Ressourcendateien</Filter>
 | 
			
		||||
    </None>
 | 
			
		||||
    <None Include="res\input8.txt">
 | 
			
		||||
      <Filter>Ressourcendateien</Filter>
 | 
			
		||||
    </None>
 | 
			
		||||
    <None Include="res\input8-KNF.txt">
 | 
			
		||||
      <Filter>Ressourcendateien</Filter>
 | 
			
		||||
    </None>
 | 
			
		||||
    <None Include="res\input12.txt">
 | 
			
		||||
      <Filter>Ressourcendateien</Filter>
 | 
			
		||||
    </None>
 | 
			
		||||
  </ItemGroup>
 | 
			
		||||
  <ItemGroup>
 | 
			
		||||
    <ResourceCompile Include="GDE_3.rc">
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										5
									
								
								GDE_3_2008/res/input12.txt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										5
									
								
								GDE_3_2008/res/input12.txt
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,5 @@
 | 
			
		|||
Variables: a, b, c, d, e, f, g, h, i, j, k, l
 | 
			
		||||
Terms:
 | 
			
		||||
"0x0">1
 | 
			
		||||
"xx01xx01">1
 | 
			
		||||
"xx01xx01xx01">1
 | 
			
		||||
							
								
								
									
										3
									
								
								GDE_3_2008/res/input8-KNF.txt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								GDE_3_2008/res/input8-KNF.txt
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
Variables: a, b, c, d, e, f, g, h
 | 
			
		||||
Terms:
 | 
			
		||||
"xx01xx01">0
 | 
			
		||||
							
								
								
									
										3
									
								
								GDE_3_2008/res/input8.txt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								GDE_3_2008/res/input8.txt
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
Variables: a, b, c, d, e, f, g, h
 | 
			
		||||
Terms:
 | 
			
		||||
"xx01xx01">1
 | 
			
		||||
| 
						 | 
				
			
			@ -7,9 +7,6 @@
 | 
			
		|||
 | 
			
		||||
using namespace std;
 | 
			
		||||
 | 
			
		||||
extern uint dimension;
 | 
			
		||||
extern uint numElements;
 | 
			
		||||
 | 
			
		||||
bool PrimImplikant::valueAt(uint pos) {
 | 
			
		||||
	for (vector<uint>::iterator i = elements.begin(); i < elements.end(); ++i)
 | 
			
		||||
		if (*i == pos)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue