10000 Удален тестовый блок · greenDev7/DijkstraAlgorithm@bef9990 · GitHub
[go: up one dir, main page]
Skip to content

Commit bef9990

Browse files
author
Зелёный Андрей Сергеевич
committed
Удален тестовый блок
1 parent b14add3 commit bef9990

File tree

1 file changed

+1
-39
lines changed

1 file changed

+1
-39
lines changed

‎Graph.cs

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -46,33 +46,6 @@ public class Graph
4646
/// <returns></returns>
4747
double Weight(Vertex v1, Vertex v2)
4848
{
49-
#region Блок для тестирования
50-
51-
if (IsWeightFromTo(v1, 0, 0, v2, 0, 1))
52-
return 1.0;
53-
if (IsWeightFromTo(v1, 0, 1, v2, 0, 2))
54-
return 3.0;
55-
if (IsWeightFromTo(v1, 0, 0, v2, 1, 0))
56-
return 1.0;
57-
if (IsWeightFromTo(v1, 1, 0, v2, 1, 1))
58-
return 100.0;
59-
if (IsWeightFromTo(v1, 1, 1, v2, 1, 2))
60-
return 10.0;
61-
if (IsWeightFromTo(v1, 0, 2, v2, 1, 2))
62-
return 2.0;
63-
if (IsWeightFromTo(v1, 0, 0, v2, 1, 1))
64-
return 40.0;
65-
if (IsWeightFromTo(v1, 1, 0, v2, 0, 1))
66-
return 50.0;
67-
if (IsWeightFromTo(v1, 0, 1, v2, 1, 2))
68-
return 70.0;
69-
if (IsWeightFromTo(v1, 1, 1, v2, 0, 2))
70-
return 30.0;
71-
if (IsWeightFromTo(v1, 0, 1, v2, 1, 1))
72-
return 50.0;
73-
74-
#endregion
75-
7649
(double, double) x1y1 = GetRealXY(v1);
7750
(double, double) x2y2 = GetRealXY(v2);
7851

@@ -83,18 +56,7 @@ double Weight(Vertex v1, Vertex v2)
8356
double sumOfSquares = Math.Pow(xDiff, 2.0) + Math.Pow(yDiff, 2.0) + Math.Pow(zDiff, 2.0);
8457

8558
return Math.Sqrt(sumOfSquares);
86-
}
87-
88-
private bool IsWeightFromTo(Vertex v1, int x1, int y1, Vertex v2, int x2, int y2)
89-
{
90-
bool case1 = x1 == v1.Coordinate.i && y1 == v1.Coordinate.j &&
91-
x2 == v2.Coordinate.i && y2 == v2.Coordinate.j;
92-
93-
bool case2 = x1 == v2.Coordinate.i && y1 == v2.Coordinate.j &&
94-
x2 == v1.Coordinate.i && y2 == v1.Coordinate.j;
95-
96-
return case1 || case2;
97-
}
59+
}
9860

9961
/// <summary>
10062
/// Возвращает кратчайший путь между двумя заданными вершинами графа

0 commit comments

Comments
 (0)
0