Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions Test2/Graph/Graph.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 16
VisualStudioVersion = 16.0.31410.357
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Graph", "Graph\Graph.vcxproj", "{F230C9CD-70BB-467E-AA33-F672BC66E92C}"
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
{F230C9CD-70BB-467E-AA33-F672BC66E92C}.Debug|x64.ActiveCfg = Debug|x64
{F230C9CD-70BB-467E-AA33-F672BC66E92C}.Debug|x64.Build.0 = Debug|x64
{F230C9CD-70BB-467E-AA33-F672BC66E92C}.Debug|x86.ActiveCfg = Debug|Win32
{F230C9CD-70BB-467E-AA33-F672BC66E92C}.Debug|x86.Build.0 = Debug|Win32
{F230C9CD-70BB-467E-AA33-F672BC66E92C}.Release|x64.ActiveCfg = Release|x64
{F230C9CD-70BB-467E-AA33-F672BC66E92C}.Release|x64.Build.0 = Release|x64
{F230C9CD-70BB-467E-AA33-F672BC66E92C}.Release|x86.ActiveCfg = Release|Win32
{F230C9CD-70BB-467E-AA33-F672BC66E92C}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {48E101DB-C036-4ACB-9F86-4400C2D227E3}
EndGlobalSection
EndGlobal
124 changes: 124 additions & 0 deletions Test2/Graph/Graph/Graph.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
#include "Graph.h"
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
#include "../../List/List/List.h"

typedef struct Node
{
int index;
int lenght;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Она length

} Node;

typedef struct Graph
{
Node** nodes;
int nodesCount;
int** matrix;
} Graph;

Graph* createGraph(int numberOfNode)
{
Graph* newGraph = calloc(1, sizeof(Graph));
newGraph->nodes = calloc(numberOfNode, sizeof(Node*));
for (int i = 0; i < numberOfNode; i++)
{
newGraph->nodes[i] = calloc(1, sizeof(int*));

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sizeof(int*) тут очень внезапно, sizeof(Node) имелось в виду, скорее всего

newGraph->nodes[i]->index = i;
newGraph->nodes[i]->lenght = 0;
}
newGraph->matrix = calloc(numberOfNode, sizeof(int*));
for (int i = 0; i < numberOfNode; i++)
{
newGraph->matrix[i] = calloc(numberOfNode, sizeof(int));
}
return newGraph;
}

void edgeLength(Graph* graph, int firstVertex, int secondVertex, int lenght)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Я бы её назвал как setEdgeLength или что-то такое, чтобы это была повелительная форма

{
graph->matrix[firstVertex][secondVertex] = lenght;
graph->matrix[secondVertex][firstVertex] = lenght;
}

void printMatrix(Graph* graph)
{
for (int i = 0; i < 6; i++)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nodesCount вместо 6, скорее всего

{
printf("\n ");
for (int j = 0; j < 6; j++)
{
printf("%d ", graph->matrix[i][j]);
}
}
}

int getLength(Graph* graph, int firstVertex, int secondVertex)
{
return graph->matrix[firstVertex][secondVertex];
}


typedef struct Table
{
int numberOfSegments;
struct List** array;
} Table;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Объявления типов лучше сверху все


Table* lenght(List* list, Error* error, Graph* graph)
{
while (!isEmpty(list))
{
Position* position = first(list, error);
while (position != NULL)
{
for (int i = 0; i < returnSize(list); i++)
{
int l = get(list, position, error);
int a = getLength(graph, i, l);
add(list, value, error);
if (a != 0)
{
add(newList, i ,error);
removeElement(list);
}
if (a == 0)
{
return;
}
lenght(list, error, graph);
next(position);
}
}
}
}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Как я понял, это сильно недописанная попытка сделать dfs. Но если он рекурсивный, то list (очередь рассматриваемых вершин?) не нужен, мы ходим просто по соседям, а если нерекурсивный, то не нужен рекурсивный вызов. И в любом случае, нужно множество уже посещённых вершин. И тогда вся задача своидтся к "пока есть непосещённые вершины, берём первую из них, гоним dfs, все посещённые при этом вершины складываем в новую компоненту связности"


void printTable(Table* table)
{
for (int i = 0; i < table->numberOfSegments; i++)
{
printf("\n");
print(table->array[i]);
}
}


int main(void)
{
Graph* graph = NULL;
Error error = NOT_ERROR;
edgeLength(graph, 0, 1, 2);
edgeLength(graph, 0, 1, 2);
edgeLength(graph, 0, 1, 2);
edgeLength(graph, 0, 1, 2);
edgeLength(graph, 0, 1, 2);
edgeLength(graph, 0, 1, 2);
edgeLength(graph, 0, 1, 2);
edgeLength(graph, 0, 1, 2);
List* list = createList();
for (int i = 0; i < 6; i++)
{
add(list, i , &error);
}

}
1 change: 1 addition & 0 deletions Test2/Graph/Graph/Graph.h
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#pragma once
150 changes: 150 additions & 0 deletions Test2/Graph/Graph/Graph.vcxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
<?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>{f230c9cd-70bb-467e-aa33-f672bc66e92c}</ProjectGuid>
<RootNamespace>Graph</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>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</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="Graph.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="Graph.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
27 changes: 27 additions & 0 deletions Test2/Graph/Graph/Graph.vcxproj.filters
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Исходные файлы">
<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="Файлы заголовков">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
</Filter>
<Filter Include="Файлы ресурсов">
<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="Graph.c">
<Filter>Исходные файлы</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="Graph.h">
<Filter>Файлы заголовков</Filter>
</ClInclude>
</ItemGroup>
</Project>