New kit/nodes

pbloem · Sep 25, 2016 · ea77142 · ea77142
1 parent 9f87661
commit ea77142
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -18,8 +18,8 @@
 		  <artifactId>maven-compiler-plugin</artifactId>
 		  <version>3.5.1</version>
 		  <configuration>
-		    <source>1.6</source>
-		    <target>1.6</target>
+		    <source>1.8</source>
+		    <target>1.8</target>
 		  </configuration>
 		</plugin>
 
@@ -61,7 +61,19 @@
 				</execution>
 			</executions>
 		</plugin>
-	</plugins>
+	  <plugin>  <!-- Create sources.jar -->
+        <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <executions>
+                <execution>
+                    <id>attach-sources</id>
+                    <goals>
+                        <goal>jar</goal>
+                    </goals>
+                </execution>
+            </executions>
+   		</plugin>
+	  </plugins>
   </build>
 
   <dependencies>  
@@ -80,7 +92,7 @@
     <dependency>
 	    <groupId>com.github.Data2Semantics</groupId>
 	    <artifactId>nodes</artifactId>
-	    <version>v0.1.16</version>
+	    <version>v0.1.17</version>
 	</dependency> 
 <!--    <dependency> -->
 <!--   		<groupId>data2semantics</groupId> -->

diff --git a/src/main/java/nl/peterbloem/motive/MotifModel.java b/src/main/java/nl/peterbloem/motive/MotifModel.java
@@ -122,7 +122,7 @@ public static <L> double size(Graph<L> graph, Graph<L> sub,
 					additions.add((int)removals.frequency(pair));
 				}
 
-			bits.add("multiple-edges", Functions.prefix(additions.isEmpty() ? 0 : Functions.max(additions)));
+			bits.add("multiple-edges", Functions.prefix(additions.isEmpty() ? 0 : (long)Functions.max(additions)));
 			bits.add("multiple-edges", OnlineModel.storeIntegers(additions)); 
 		}
 
@@ -287,7 +287,7 @@ public static List<D> subbedDegrees(
 		for(Pair<Integer, Integer> token : instanceToInstance.tokens())
 			additions.add((int)instanceToInstance.frequency(token) - 1);
 
-		rest.add("multi-edges", Functions.prefix(additions.isEmpty() ? 0 : Functions.max(additions)));
+		rest.add("multi-edges", Functions.prefix(additions.isEmpty() ? 0 : (long)Functions.max(additions)));
 		rest.add("multi-edges", OnlineModel.storeIntegers(additions)); 
 
 		// * check for any disconnected nodes and add 0s
@@ -431,7 +431,7 @@ public static List<Integer> subbedDegrees(
 
 		rest.add("multi-edges", Functions.prefix(
 				additions.isEmpty() ? 
-				0 : Functions.max(additions)));
+				0 : (long)Functions.max(additions)));
 		rest.add("multi-edges", OnlineModel.storeIntegers(additions)); 
 
 		// * check for any disconnected nodes and add 0s
@@ -682,7 +682,7 @@ private static void sizeSubbedER(DGraph<?> graph, DGraph<?> sub,
 		for(Pair<Integer, Integer> token : instanceToInstance.tokens())
 			additions.add((int)instanceToInstance.frequency(token) - 1);
 
-		bits.add("multiple-edges", Functions.prefix(additions.isEmpty() ? 0 : max(additions)));
+		bits.add("multiple-edges", Functions.prefix(additions.isEmpty() ? 0 : (long)max(additions)));
 		bits.add("multiple-edges", OnlineModel.storeIntegers(additions)); 
 	}
 
@@ -751,7 +751,7 @@ private static void sizeSubbedER(UGraph<?> graph, UGraph<?> sub,
 		for(Pair<Integer, Integer> token : instanceToInstance.tokens())
 			additions.add((int)instanceToInstance.frequency(token) - 1);
 
-		bits.add("multiple-edges", Functions.prefix(additions.isEmpty() ? 0 : max(additions)));
+		bits.add("multiple-edges", Functions.prefix(additions.isEmpty() ? 0 : (long)max(additions)));
 		bits.add("multiple-edges", OnlineModel.storeIntegers(additions)); 
 	}	
 

diff --git a/src/test/java/nl/peterbloem/motive/MotifModelTest.java b/src/test/java/nl/peterbloem/motive/MotifModelTest.java
@@ -257,7 +257,7 @@ public static <L> double sizeBetaCopying(DGraph<L> graph, DGraph<L> sub,
 					additions.add((int)removals.frequency(pair));
 				}
 
-			rest.add("multi-edges", Functions.prefix(additions.isEmpty() ? 0 : Functions.max(additions)));
+			rest.add("multi-edges", Functions.prefix(additions.isEmpty() ? 0 : (long) Functions.max(additions)));
 			rest.add("multi-edges", OnlineModel.storeIntegers(additions)); 
 
 			// * Store the rewiring information
@@ -327,7 +327,7 @@ public static <L> double sizeBetaCopying(UGraph<L> graph, UGraph<L> sub,
 				additions.add((int)removals.frequency(pair));
 			}
 
-		rest.add("multi-edges", Functions.prefix(additions.isEmpty() ? 0 : Functions.max(additions)));
+		rest.add("multi-edges", Functions.prefix(additions.isEmpty() ? 0 : (long) Functions.max(additions)));
 		rest.add("multi-edges", OnlineModel.storeIntegers(additions)); 
 
 		// * Store the rewiring information