libavoid bug fixes (#956)

* fixed id bug, moved hyperedges to normal options * update libavoid server version --------- Co-authored-by: Daniel Lindhuber <[email protected]>
eclipse · Sep 20, 2023 · cfc8845 · cfc8845
1 parent 8389811
commit cfc8845
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/plugins/org.eclipse.elk.alg.libavoid/pom.xml b/plugins/org.eclipse.elk.alg.libavoid/pom.xml
@@ -62,7 +62,7 @@
               <goal>wget</goal>
             </goals>
             <configuration>
-              <url>https://github.com/TypeFox/libavoid-server/releases/download/v0.3.0/libavoid-server-linux</url>
+              <url>https://github.com/TypeFox/libavoid-server/releases/download/v0.3.1/libavoid-server-linux</url>
               <outputDirectory>${project.basedir}/libavoid-server</outputDirectory>
             </configuration>
           </execution>
@@ -73,7 +73,7 @@
               <goal>wget</goal>
             </goals>
             <configuration>
-              <url>https://github.com/TypeFox/libavoid-server/releases/download/v0.3.0/libavoid-server-macos</url>
+              <url>https://github.com/TypeFox/libavoid-server/releases/download/v0.3.1/libavoid-server-macos</url>
               <outputDirectory>${project.basedir}/libavoid-server</outputDirectory>
             </configuration>
           </execution>
@@ -84,7 +84,7 @@
               <goal>wget</goal>
             </goals>
             <configuration>
-              <url>https://github.com/TypeFox/libavoid-server/releases/download/v0.3.0/libavoid-server-win.exe</url>
+              <url>https://github.com/TypeFox/libavoid-server/releases/download/v0.3.1/libavoid-server-win.exe</url>
               <outputDirectory>${project.basedir}/libavoid-server</outputDirectory>
             </configuration>
           </execution>

diff --git a/...eclipse.elk.alg.libavoid/src/org/eclipse/elk/alg/libavoid/LibavoidServerCommunicator.java b/...eclipse.elk.alg.libavoid/src/org/eclipse/elk/alg/libavoid/LibavoidServerCommunicator.java
@@ -310,6 +310,11 @@ private void transformOptions(final ElkNode node) {
         	addOption(LibavoidOptions.DIRECTION, direction);
         }
 
+        boolean enableHyperedgesFromCommonSource =
+        		node.getProperty(LibavoidOptions.ENABLE_HYPEREDGES_FROM_COMMON_SOURCE);
+        addOption(LibavoidOptions.ENABLE_HYPEREDGES_FROM_COMMON_SOURCE,
+        		enableHyperedgesFromCommonSource);
+
         /*
          * Penalties
          */
@@ -384,11 +389,6 @@ private void transformOptions(final ElkNode node) {
         		node.getProperty(LibavoidOptions.NUDGE_SHARED_PATHS_WITH_COMMON_END_POINT);
         addRoutingOption(LibavoidOptions.NUDGE_SHARED_PATHS_WITH_COMMON_END_POINT,
         		nudgeSharedPathsWithCommonEndPoint);
-
-        boolean enableHyperedgesFromCommonSource =
-        		node.getProperty(LibavoidOptions.ENABLE_HYPEREDGES_FROM_COMMON_SOURCE);
-        addRoutingOption(LibavoidOptions.ENABLE_HYPEREDGES_FROM_COMMON_SOURCE,
-        		enableHyperedgesFromCommonSource);
     }
 
     private void addOption(final IProperty<?> key, final Object value) {
@@ -609,13 +609,14 @@ private void transformNode(final ElkNode node, final double x, final double y) {
 		libavoidNode(node, nodeIdCounter, 
 				x, y, node.getWidth(), node.getHeight(), 
 				portLessIncomingEdges, portLessOutgoingEdges);
-		nodeIdCounter++;
 
 		// transfer all ports
 		for (ElkPort port : node.getPorts()) {
 			libavoidPort(port, portIdCounter, nodeIdCounter, null);
 			portIdCounter++;
 		}
+
+        nodeIdCounter++;
 	}
 
 	/**