Changeset 14245 for trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Igraph/0.8.0-pre/HeuristicLab.Igraph-0.8.0-pre/Wrappers/Graph.cs

Timestamp:

08/08/16 23:36:49 (8 years ago)

Author:

abeham

Message:

#2651: worked on igraph integration

File:

• trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Igraph/0.8.0-pre/HeuristicLab.Igraph-0.8.0-pre/Wrappers/Graph.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.Igraph/0.8.0-pre/HeuristicLab.Igraph-0.8.0-pre/Wrappers/Graph.cs

@@ -86 +86 @@
     }
     public Matrix LayoutWithFruchtermanReingold(int niter, double startTemp, Matrix initialCoords = null) {
-      if (initialCoords != null && (initialCoords.Rows != graph.n || initialCoords.Columns != 2))
+      if (initialCoords != null && (initialCoords.Rows != Vertices || initialCoords.Columns != 2))
         throw new ArgumentException("Initial coordinate matrix does not contain the required number of rows and columns.", "initialCoords");
-      var coords = initialCoords != null ? new Matrix(initialCoords) : new Matrix(graph.n, 2);
+      var coords = initialCoords != null ? new Matrix(initialCoords) : new Matrix(Vertices, 2);
       DllImporter.igraph_layout_fruchterman_reingold(graph, coords.NativeInstance, initialCoords != null, niter, startTemp, igraph_layout_grid_t.IGRAPH_LAYOUT_AUTOGRID, null, null, null, null, null);
       return coords;
@@ -97 +97 @@
     }
     public Matrix LayoutWithKamadaKawai(int maxiter, double epsilon, double kkconst, Matrix initialCoords = null) {
-      if (initialCoords != null && (initialCoords.Rows != graph.n || initialCoords.Columns != 2))
+      if (initialCoords != null && (initialCoords.Rows != Vertices || initialCoords.Columns != 2))
         throw new ArgumentException("Initial coordinate matrix does not contain the required number of rows and columns.", "initialCoords");
-      var coords = initialCoords != null ? new Matrix(initialCoords) : new Matrix(graph.n, 2);
+      var coords = initialCoords != null ? new Matrix(initialCoords) : new Matrix(Vertices, 2);
       DllImporter.igraph_layout_kamada_kawai(graph, coords.NativeInstance, initialCoords != null, maxiter, epsilon, kkconst, null, null, null, null, null);
       return coords;
@@ -109 +109 @@
     }
     public Matrix LayoutWithDavidsonHarel(int maxiter, int fineiter, double cool_fact, double weight_node_dist, double weight_border, double weight_edge_lengths, double weight_edge_crossings, double weight_node_edge_dist, Matrix initialCoords = null) {
-      if (initialCoords != null && (initialCoords.Rows != graph.n || initialCoords.Columns != 2))
+      if (initialCoords != null && (initialCoords.Rows != Vertices || initialCoords.Columns != 2))
         throw new ArgumentException("Initial coordinate matrix does not contain the required number of rows and columns.", "initialCoords");
-      var coords = initialCoords != null ? new Matrix(initialCoords) : new Matrix(graph.n, 2);
+      var coords = initialCoords != null ? new Matrix(initialCoords) : new Matrix(Vertices, 2);
       DllImporter.igraph_layout_davidson_harel(graph, coords.NativeInstance, initialCoords != null, maxiter, fineiter, cool_fact, weight_node_dist, weight_border, weight_edge_lengths, weight_edge_crossings, weight_node_edge_dist);
+      return coords;
+    }
+
+    /// <summary>
+    /// Use multi-dimensional scaling to layout vertices. 
+    /// A distance matrix can be used to specify the distances between the vertices.
+    /// Otherwise the distances will be calculated by shortest-path-length.
+    /// </summary>
+    /// <remarks>
+    /// For disconnected graphs, dimension must be 2.
+    /// </remarks>
+    /// <param name="dist">The distance matrix to layout the vertices.</param>
+    /// <param name="dim">How many dimensions should be used.</param>
+    /// <returns>The coordinates matrix of the aligned vertices.</returns>
+    public Matrix LayoutWithMds(Matrix dist = null, int dim = 2) {
+      var coords = new Matrix(Vertices, dim);
+      DllImporter.igraph_layout_mds(graph, coords.NativeInstance, dist != null ? dist.NativeInstance : null, dim);
       return coords;
     }