Skip to content

Commit

Permalink
Merge pull request #40 from artemiipatov/test2Rewriting2Task1
Browse files Browse the repository at this point in the history
Retest 2 Task 1
  • Loading branch information
artemiipatov authored Feb 19, 2022
2 parents 58c9cb3 + 3e2424e commit b53ad13
Show file tree
Hide file tree
Showing 8 changed files with 370 additions and 0 deletions.
31 changes: 31 additions & 0 deletions retest2Task1/retest2Task1.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "retest2Task1", "retest2Task1\retest2Task1.vcxproj", "{32DF747B-7097-498F-AEEA-73C5C66D4E20}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{32DF747B-7097-498F-AEEA-73C5C66D4E20}.Debug|x64.ActiveCfg = Debug|x64
{32DF747B-7097-498F-AEEA-73C5C66D4E20}.Debug|x64.Build.0 = Debug|x64
{32DF747B-7097-498F-AEEA-73C5C66D4E20}.Debug|x86.ActiveCfg = Debug|Win32
{32DF747B-7097-498F-AEEA-73C5C66D4E20}.Debug|x86.Build.0 = Debug|Win32
{32DF747B-7097-498F-AEEA-73C5C66D4E20}.Release|x64.ActiveCfg = Release|x64
{32DF747B-7097-498F-AEEA-73C5C66D4E20}.Release|x64.Build.0 = Release|x64
{32DF747B-7097-498F-AEEA-73C5C66D4E20}.Release|x86.ActiveCfg = Release|Win32
{32DF747B-7097-498F-AEEA-73C5C66D4E20}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {A0EA2221-CB01-4E4E-AABE-BC70AA024CA7}
EndGlobalSection
EndGlobal
13 changes: 13 additions & 0 deletions retest2Task1/retest2Task1/main.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#include <stdio.h>
#include "queue.h"
#include "tests.h"

int main()
{
if (!queuePassedTests())
{
printf("Tests failed");
return -1;
}
return 0;
}
83 changes: 83 additions & 0 deletions retest2Task1/retest2Task1/queue.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
#define _CRT_SECURE_NO_WARNINGS
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <limits.h>
#include "queue.h"

typedef struct QueueElement
{
int value;
struct QueueElement* next;
} QueueElement;

typedef struct Queue
{
QueueElement* tail;
QueueElement* head;
} Queue;

Queue* createQueue(void)
{
return calloc(1, sizeof(Queue));
}

bool isEmpty(Queue* queue)
{
return queue == NULL || queue->head == NULL;
}

void deleteQueue(Queue** queue)
{
QueueElement* position = (*queue)->head;
while (position != NULL)
{
(*queue)->head = (*queue)->head->next;
free(position);
position = (*queue)->head;
}
free(*queue);
*queue = NULL;
}

bool enqueue(Queue* queue, const int value)
{
QueueElement* newElement = calloc(1, sizeof(QueueElement));
if (newElement == NULL)
{
return false;
}
newElement->value = value;
if (queue->head == NULL)
{
queue->head = newElement;
queue->tail = queue->head;
return true;
}
queue->tail->next = newElement;
queue->tail = newElement;
return true;
}

int dequeue(Queue* queue)
{
if (queue == NULL || queue->head == NULL)
{
return -1;
}
const int result = queue->head->value;
QueueElement* temp = queue->head->next;
free(queue->head);
queue->head = temp;
return result;
}

int processQuery(Queue* queue, const int query)
{
if (query == -1)
{
return dequeue(queue);
}
return enqueue(queue, query);
}
20 changes: 20 additions & 0 deletions retest2Task1/retest2Task1/queue.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#pragma once
#include <stdbool.h>

// queue structure
typedef struct Queue Queue;

// creates queue
Queue* createQueue(void);

// deletes queue
void deleteQueue(Queue** queue);

// adds element with given key and priority at the tail of the queue
bool enqueue(Queue* queue, int value);

// delete element with maximum priority and returns its value
int dequeue(Queue* queue);

// processes query
int processQuery(Queue* queue, const int query);
153 changes: 153 additions & 0 deletions retest2Task1/retest2Task1/retest2Task1.vcxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion>
<Keyword>Win32Proj</Keyword>
<ProjectGuid>{32df747b-7097-498f-aeea-73c5c66d4e20}</ProjectGuid>
<RootNamespace>retest2Task1</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="queue.c" />
<ClCompile Include="main.c" />
<ClCompile Include="tests.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="queue.h" />
<ClInclude Include="tests.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
36 changes: 36 additions & 0 deletions retest2Task1/retest2Task1/retest2Task1.vcxproj.filters
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="main.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="queue.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="tests.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="tests.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="queue.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
30 changes: 30 additions & 0 deletions retest2Task1/retest2Task1/tests.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#include "queue.h"
#include "tests.h"
#include <stdlib.h>

bool queuePassedTests(void)
{
Queue* queue = createQueue();
if (queue == NULL)
{
return false;
}
if (processQuery(queue, -1) != -1
|| processQuery(queue, 1) != 1
|| processQuery(queue, 2) != 1
|| processQuery(queue, 3) != 1
|| processQuery(queue, 4) != 1)
{
return false;
}
if (processQuery(queue, -1) != 1
|| processQuery(queue, -1) != 2
|| processQuery(queue, -1) != 3
|| processQuery(queue, -1) != 4
|| processQuery(queue, -1) != -1)
{
return false;
}
deleteQueue(&queue);
return queue == NULL;
}
4 changes: 4 additions & 0 deletions retest2Task1/retest2Task1/tests.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#include <stdbool.h>

// tests queue module functions
bool queuePassedTests(void);

0 comments on commit b53ad13

Please sign in to comment.