fix
This commit is contained in:
Jonny007-MKD
parent
c4ab8240c6
commit
0b2912bb17
|
|
@ -28,7 +28,6 @@
|
|||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseOfMfc>Static</UseOfMfc>
|
||||
<CharacterSet>MultiByte</CharacterSet>
|
||||
<PlatformToolset>v110</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
|
|
@ -43,7 +42,7 @@
|
|||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup>
|
||||
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
|
||||
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
|
||||
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir>
|
||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
|
||||
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
|
||||
|
|
@ -63,7 +62,7 @@
|
|||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
||||
</ClCompile>
|
||||
|
|
@ -119,15 +118,15 @@
|
|||
<ClCompile Include="..\Hazard\Hazard\KV.cpp" />
|
||||
<ClCompile Include="..\Hazard\Hazard\PrimImplikant.cpp" />
|
||||
<ClCompile Include="..\Hazard\Hazard\PrimImplikantCollection.cpp" />
|
||||
<ClCompile Include="..\Hazard\Hazard\stdafx.cpp">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Hazard\Hazard\Wertetabelle.cpp" />
|
||||
<ClCompile Include="GDE_3.cpp" />
|
||||
<ClCompile Include="GDE_3Doc.cpp" />
|
||||
<ClCompile Include="GDE_3View.cpp" />
|
||||
<ClCompile Include="MainFrm.cpp" />
|
||||
<ClCompile Include="stdafx.cpp">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="user.cpp" />
|
||||
<ClCompile Include="Graphics\Dib.cpp" />
|
||||
<ClCompile Include="Graphics\Graphicfunctions.cpp" />
|
||||
|
|
@ -137,7 +136,7 @@
|
|||
<ItemGroup>
|
||||
<ClInclude Include="..\Hazard\Hazard\Cell.h" />
|
||||
<ClInclude Include="..\Hazard\Hazard\CellCollection.h" />
|
||||
<ClInclude Include="..\Hazard\Hazard\CParser.h" />
|
||||
<ClInclude Include="..\Hazard\Hazard\Cparser.h" />
|
||||
<ClInclude Include="..\Hazard\Hazard\KV.h" />
|
||||
<ClInclude Include="..\Hazard\Hazard\PrimImplikant.h" />
|
||||
<ClInclude Include="..\Hazard\Hazard\PrimImplikantCollection.h" />
|
||||
|
|
@ -148,6 +147,7 @@
|
|||
<ClInclude Include="MainFrm.h" />
|
||||
<ClInclude Include="Resource.h" />
|
||||
<ClInclude Include="stdafx.h" />
|
||||
<ClInclude Include="User.h" />
|
||||
<ClInclude Include="Graphics\BaseException.h" />
|
||||
<ClInclude Include="Graphics\Dib.h" />
|
||||
<ClInclude Include="Graphics\Graphicfunctions.h" />
|
||||
|
|
@ -155,7 +155,6 @@
|
|||
<ClInclude Include="Graphics\PointerArray.h" />
|
||||
<ClInclude Include="Graphics\Shape.h" />
|
||||
<ClInclude Include="Console\Console.h" />
|
||||
<ClInclude Include="User.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="res\GDE_3.ico" />
|
||||
|
|
|
|||
|
|
@ -14,10 +14,10 @@
|
|||
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
|
||||
</Filter>
|
||||
<Filter Include="Graphics">
|
||||
<UniqueIdentifier>{1fd09ea8-21ab-4cb5-9115-9b0c2d0ff524}</UniqueIdentifier>
|
||||
<UniqueIdentifier>{1eef563e-1f3c-4664-8e16-137f489590e9}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Console">
|
||||
<UniqueIdentifier>{9be85dd5-64a4-4050-89fa-728d697c9169}</UniqueIdentifier>
|
||||
<UniqueIdentifier>{00f0dea2-e897-4d33-a605-14a3af6e5f4a}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
@ -33,6 +33,9 @@
|
|||
<ClCompile Include="MainFrm.cpp">
|
||||
<Filter>Quelldateien</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="stdafx.cpp">
|
||||
<Filter>Quelldateien</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="user.cpp">
|
||||
<Filter>Quelldateien</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -48,10 +51,19 @@
|
|||
<ClCompile Include="Console\Console.cpp">
|
||||
<Filter>Console</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Hazard\Hazard\Cell.cpp">
|
||||
<Filter>Quelldateien</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Hazard\Hazard\CellCollection.cpp">
|
||||
<Filter>Quelldateien</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Hazard\Hazard\CParser.cpp">
|
||||
<Filter>Quelldateien</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Hazard\Hazard\Hazard.cpp">
|
||||
<Filter>Quelldateien</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Hazard\Hazard\Cell.cpp">
|
||||
<ClCompile Include="..\Hazard\Hazard\KV.cpp">
|
||||
<Filter>Quelldateien</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Hazard\Hazard\PrimImplikant.cpp">
|
||||
|
|
@ -63,18 +75,6 @@
|
|||
<ClCompile Include="..\Hazard\Hazard\Wertetabelle.cpp">
|
||||
<Filter>Quelldateien</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Hazard\Hazard\CParser.cpp">
|
||||
<Filter>Quelldateien</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Hazard\Hazard\KV.cpp">
|
||||
<Filter>Quelldateien</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Hazard\Hazard\CellCollection.cpp">
|
||||
<Filter>Quelldateien</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Hazard\Hazard\stdafx.cpp">
|
||||
<Filter>Quelldateien</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="GDE_3.h">
|
||||
|
|
@ -95,6 +95,9 @@
|
|||
<ClInclude Include="stdafx.h">
|
||||
<Filter>Headerdateien</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="User.h">
|
||||
<Filter>Headerdateien</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Graphics\BaseException.h">
|
||||
<Filter>Graphics</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -116,13 +119,16 @@
|
|||
<ClInclude Include="Console\Console.h">
|
||||
<Filter>Console</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="User.h">
|
||||
<Filter>Headerdateien</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Hazard\Hazard\Cell.h">
|
||||
<Filter>Headerdateien</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Hazard\Hazard\CParser.h">
|
||||
<ClInclude Include="..\Hazard\Hazard\CellCollection.h">
|
||||
<Filter>Headerdateien</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Hazard\Hazard\Cparser.h">
|
||||
<Filter>Headerdateien</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Hazard\Hazard\KV.h">
|
||||
<Filter>Headerdateien</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Hazard\Hazard\PrimImplikant.h">
|
||||
|
|
@ -134,12 +140,6 @@
|
|||
<ClInclude Include="..\Hazard\Hazard\Wertetabelle.h">
|
||||
<Filter>Headerdateien</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Hazard\Hazard\KV.h">
|
||||
<Filter>Headerdateien</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Hazard\Hazard\CellCollection.h">
|
||||
<Filter>Headerdateien</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="res\GDE_3.ico">
|
||||
|
|
|
|||
|
|
@ -16,6 +16,37 @@ uint dimension = 0; // = variables.size()
|
|||
uint numElements = 0; // = 2 ^ dimension
|
||||
bool KNF = false;
|
||||
|
||||
|
||||
int open_files(FILE * &input, FILE * &error, FILE * &list)
|
||||
{
|
||||
fopen_s(&input, "res\\input.txt", "r");
|
||||
if (input == 0)
|
||||
{
|
||||
cout << "Fehler Inputdatei";
|
||||
return 1;
|
||||
}
|
||||
fopen_s(&error, "res\\errorParser.txt", "a");
|
||||
if (error == 0)
|
||||
{
|
||||
cout << "Fehler Fehlerdatei";
|
||||
return 1;
|
||||
}
|
||||
fopen_s(&list, "res\\listParser.txt", "w");
|
||||
if (list == 0)
|
||||
{
|
||||
cout << "Fehler Listdatei";
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
void pause()
|
||||
{
|
||||
#ifdef DEBUG
|
||||
system("pause");
|
||||
#endif
|
||||
}
|
||||
|
||||
void user_main(void)
|
||||
{
|
||||
FILE * input;
|
||||
|
|
@ -76,34 +107,4 @@ void user_main(void)
|
|||
|
||||
pause();
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
int open_files(FILE * &input, FILE * &error, FILE * &list)
|
||||
{
|
||||
fopen_s(&input, "res\\input.txt", "r");
|
||||
if (input == 0)
|
||||
{
|
||||
cout << "Fehler Inputdatei";
|
||||
return 1;
|
||||
}
|
||||
fopen_s(&error, "res\\errorParser.txt", "a");
|
||||
if (error == 0)
|
||||
{
|
||||
cout << "Fehler Fehlerdatei";
|
||||
return 1;
|
||||
}
|
||||
fopen_s(&list, "res\\listParser.txt", "w");
|
||||
if (list == 0)
|
||||
{
|
||||
cout << "Fehler Listdatei";
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
void pause()
|
||||
{
|
||||
#if DEBUG
|
||||
system("pause");
|
||||
#endif
|
||||
}
|
||||
Loading…
Reference in a new issue