@@ -49,33 +49,6 @@ public class Graph
49
49
/// <returns></returns>
50
50
double Weight ( Vertex v1 , Vertex v2 )
51
51
{
52
- #region Блок для тестирования
53
-
54
- if ( IsWeightFromTo ( v1 , 0 , 0 , v2 , 0 , 1 ) )
55
- return 1.0 ;
56
- if ( IsWeightFromTo ( v1 , 0 , 1 , v2 , 0 , 2 ) )
57
- return 3.0 ;
58
- if ( IsWeightFromTo ( v1 , 0 , 0 , v2 , 1 , 0 ) )
59
- return 1.0 ;
60
- if ( IsWeightFromTo ( v1 , 1 , 0 , v2 , 1 , 1 ) )
61
- return 100.0 ;
62
- if ( IsWeightFromTo ( v1 , 1 , 1 , v2 , 1 , 2 ) )
63
- return 10.0 ;
64
- if ( IsWeightFromTo ( v1 , 0 , 2 , v2 , 1 , 2 ) )
65
- return 2.0 ;
66
- if ( IsWeightFromTo ( v1 , 0 , 0 , v2 , 1 , 1 ) )
67
- return 40.0 ;
68
- if ( IsWeightFromTo ( v1 , 1 , 0 , v2 , 0 , 1 ) )
69
- return 50.0 ;
70
- if ( IsWeightFromTo ( v1 , 0 , 1 , v2 , 1 , 2 ) )
71
- return 70.0 ;
72
- if ( IsWeightFromTo ( v1 , 1 , 1 , v2 , 0 , 2 ) )
73
- return 30.0 ;
74
- if ( IsWeightFromTo ( v1 , 0 , 1 , v2 , 1 , 1 ) )
75
- return 50.0 ;
76
-
77
- #endregion
78
-
79
52
( double , double ) x1y1 = GetRealXY ( v1 ) ;
80
53
( double , double ) x2y2 = GetRealXY ( v2 ) ;
81
54
@@ -88,17 +61,6 @@ double Weight(Vertex v1, Vertex v2)
88
61
return Math . Sqrt ( sumOfSquares ) ;
89
62
}
90
63
91
- private bool IsWeightFromTo ( Vertex v1 , int x1 , int y1 , Vertex v2 , int x2 , int y2 )
92
- {
93
- bool case1 = x1 == v1 . Coordinate . i && y1 == v1 . Coordinate . j &&
94
- x2 == v2 . Coordinate . i && y2 == v2 . Coordinate . j ;
95
-
96
- bool case2 = x1 == v2 . Coordinate . i && y1 == v2 . Coordinate . j &&
97
- x2 == v1 . Coordinate . i && y2 == v1 . Coordinate . j ;
98
-
99
- return case1 || case2 ;
100
- }
101
-
102
64
/// <summary>
103
65
/// Возвращает кратчайший путь между двумя заданными вершинами графа
104
66
/// </summary>
0 commit comments