|
@@ -2,38 +2,38 @@
|
|
|
{
|
|
|
public class Matrix
|
|
|
{
|
|
|
- public static int[,] AdjacencyCreate(Vertex[] vertices, Edge[] edges)
|
|
|
+ public static int[,] AdjacencyCreate(Node[] nodes, Edge[] edges)
|
|
|
{
|
|
|
- int length = vertices.Length;
|
|
|
+ int length = nodes.Length;
|
|
|
int[,] matrix = new int[length, length];
|
|
|
- for (int i = 0; i < vertices.Length; i++)
|
|
|
+ for (int i = 0; i < nodes.Length; i++)
|
|
|
{
|
|
|
- var vertex1 = vertices[i];
|
|
|
- for (int j = 0; j < vertices.Length; j++)
|
|
|
+ var Node1 = nodes[i];
|
|
|
+ for (int j = 0; j < nodes.Length; j++)
|
|
|
{
|
|
|
if (i != j)
|
|
|
{
|
|
|
- var vertex2 = vertices[j];
|
|
|
+ var Node2 = nodes[j];
|
|
|
for (int k = 0; k < edges.Length; k++)
|
|
|
{
|
|
|
var edge = edges[k];
|
|
|
if (edge.IsFocused)
|
|
|
{
|
|
|
- if (Vertex.Compare(edge.FinishVertex, vertex1) &&
|
|
|
- Vertex.Compare(edge.StartVertex, vertex2))
|
|
|
+ if (Node.Compare(edge.FinishNode, Node1) &&
|
|
|
+ Node.Compare(edge.StartNode, Node2))
|
|
|
if (edge.Weight > 0)
|
|
|
matrix[i, j] = (int) edge.Weight;
|
|
|
else
|
|
|
matrix[i, j] = 1;
|
|
|
- else if (Vertex.Compare(edge.StartVertex, vertex1) &&
|
|
|
- Vertex.Compare(edge.FinishVertex, vertex2))
|
|
|
+ else if (Node.Compare(edge.StartNode, Node1) &&
|
|
|
+ Node.Compare(edge.FinishNode, Node2))
|
|
|
if (edge.Weight > 0)
|
|
|
matrix[i, j] = (int) edge.Weight;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- if (Vertex.Compare(edge.FinishVertex, vertex1) &&
|
|
|
- Vertex.Compare(edge.StartVertex, vertex2))
|
|
|
+ if (Node.Compare(edge.FinishNode, Node1) &&
|
|
|
+ Node.Compare(edge.StartNode, Node2))
|
|
|
if (edge.Weight > 0)
|
|
|
{
|
|
|
matrix[i, j] = (int) edge.Weight;
|
|
@@ -44,8 +44,8 @@
|
|
|
matrix[i, j] = 1;
|
|
|
InvertElement(matrix, i, j);
|
|
|
}
|
|
|
- else if (Vertex.Compare(edge.StartVertex, vertex1) &&
|
|
|
- Vertex.Compare(edge.FinishVertex, vertex2))
|
|
|
+ else if (Node.Compare(edge.StartNode, Node1) &&
|
|
|
+ Node.Compare(edge.FinishNode, Node2))
|
|
|
if (edge.Weight > 0)
|
|
|
{
|
|
|
matrix[i, j] = (int) edge.Weight;
|
|
@@ -73,25 +73,25 @@
|
|
|
matrix[indexY, indexX] = matrix[indexX, indexY];
|
|
|
return matrix;
|
|
|
}
|
|
|
- public static int[,] IncidenceCreate(Vertex[] vertices, Edge[] edges)
|
|
|
+ public static int[,] IncidenceCreate(Node[] nodes, Edge[] edges)
|
|
|
{
|
|
|
- var rows = vertices.Length;
|
|
|
+ var rows = nodes.Length;
|
|
|
var cols = edges.Length;
|
|
|
var matrix = new int[rows, cols];
|
|
|
for (var i = 0; i < rows; i++)
|
|
|
{
|
|
|
- var vertex = vertices[i];
|
|
|
+ var Node = nodes[i];
|
|
|
|
|
|
for (var j = 0; j < cols; j++)
|
|
|
{
|
|
|
var edge = edges[j];
|
|
|
|
|
|
|
|
|
- if (Vertex.Compare(vertex, edge.FinishVertex) && edge.IsFocused)
|
|
|
+ if (Node.Compare(Node, edge.FinishNode) && edge.IsFocused)
|
|
|
matrix[i, j] = -1;
|
|
|
else
|
|
|
{
|
|
|
- if (Vertex.Compare(vertex, edge.FinishVertex) || Vertex.Compare(vertex, edge.StartVertex))
|
|
|
+ if (Node.Compare(Node, edge.FinishNode) || Node.Compare(Node, edge.StartNode))
|
|
|
if (edge.Weight > 0)
|
|
|
matrix[i, j] = (int)edge.Weight;
|
|
|
else
|