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