Merge pull request #30 from szarnyasg/master

Made the project compile with Java 7, add Travis integration

Author: szarnyasg

.travis.yml

@@ -0,0 +1,6 @@
+language: java
+jdk:
+  - openjdk7
+install: true
+script:
+  - mvn package -DskipTests

README.md

@@ -3,6 +3,8 @@
 LDBC-SNB Data Generator
 ----------------------
 
+[![Build Status](https://travis-ci.org/ldbc/ldbc_snb_datagen.svg?branch=master)](https://travis-ci.org/ldbc/ldbc_snb_datagen)
+
 The LDBC-SNB Data Generator (DATAGEN) is the responsible of providing the data sets used by all the LDBC benchmarks. This data generator is designed to produce directed labeled graphs that mimic the characteristics of those graphs of real data. A detailed description of the schema produced by datagen, as well as the format of the output files, can be found in the latest version of official [LDBC SNB specification document](https://github.com/ldbc/ldbc_snb_docs).
 
 

pom.xml

@@ -9,6 +9,12 @@
   <version>0.2.5</version>
   <packaging>jar</packaging>
 
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.target>1.7</maven.compiler.target>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
@@ -40,7 +46,7 @@
       <groupId>ca.umontreal.iro</groupId>
       <artifactId>ssj</artifactId>
       <version>2.5</version>
-    </dependency>     
+    </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>

src/main/java/ldbc/snb/datagen/generator/BTERKnowsGenerator.java

@@ -1,15 +1,23 @@
 package ldbc.snb.datagen.generator;
 
-import javafx.util.Pair;
-import ldbc.snb.datagen.objects.Knows;
-import ldbc.snb.datagen.objects.Person;
-import org.apache.hadoop.conf.Configuration;
-import org.roaringbitmap.RoaringBitmap;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Random;
+import java.util.TreeMap;
+
+import org.apache.commons.math3.util.Pair;
+import org.apache.hadoop.conf.Configuration;
+import org.roaringbitmap.RoaringBitmap;
+
+import ldbc.snb.datagen.objects.Knows;
+import ldbc.snb.datagen.objects.Person;
 
 /**
  * Created by aprat on 12/07/16.
@@ -176,7 +184,7 @@ public void generateKnows(ArrayList<Person> persons, int seed, ArrayList<Float>
         TreeMap<Long,RoaringBitmap> sortedMap = new TreeMap<Long,RoaringBitmap>(openCommunities);
         RoaringBitmap currentCommunity = null;
         long currentCommunitySize = 0;
-        for(HashMap.Entry<Long,RoaringBitmap> community : sortedMap.entrySet()) {
+        for(Map.Entry<Long,RoaringBitmap> community : sortedMap.entrySet()) {
             RoaringBitmap nextCommunity = community.getValue();
             if(currentCommunity == null) {
                 currentCommunity = nextCommunity;

src/main/java/ldbc/snb/datagen/generator/distribution/EmpiricalDistribution.java

@@ -1,16 +1,16 @@
 package ldbc.snb.datagen.generator.distribution;
 
-import javafx.util.Pair;
-import ldbc.snb.datagen.generator.DatagenParams;
-import ldbc.snb.datagen.generator.distribution.utils.Bucket;
-import ldbc.snb.datagen.generator.distribution.utils.BucketedDistribution;
-import org.apache.hadoop.conf.Configuration;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 
+import org.apache.commons.math3.util.Pair;
+import org.apache.hadoop.conf.Configuration;
+
+import ldbc.snb.datagen.generator.distribution.utils.Bucket;
+import ldbc.snb.datagen.generator.distribution.utils.BucketedDistribution;
+
 /**
  * Created by aprat on 27/06/16.
  */

src/main/java/ldbc/snb/datagen/generator/distribution/utils/Bucket.java

@@ -1,10 +1,11 @@
 package ldbc.snb.datagen.generator.distribution.utils;
 
-import javafx.util.Pair;
-import ldbc.snb.datagen.generator.DatagenParams;
-
 import java.util.ArrayList;
 
+import org.apache.commons.math3.util.Pair;
+
+import ldbc.snb.datagen.generator.DatagenParams;
+
 /**
  * Created by aprat on 3/03/15.
  */