Skip to content

Commit 19545d2

Browse files
committed
Fixed compiler bug
1 parent 379ace4 commit 19545d2

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838

3939
import ldbc.snb.datagen.dictionary.Dictionaries;
4040
import ldbc.snb.datagen.hadoop.*;
41+
import ldbc.snb.datagen.objects.Person;
42+
import ldbc.snb.datagen.objects.similarity.GeoDistanceSimilarity;
4143
import ldbc.snb.datagen.util.ConfigParser;
4244
import ldbc.snb.datagen.vocabulary.SN;
4345
import org.apache.hadoop.conf.Configuration;
@@ -60,6 +62,7 @@ public static synchronized void init (Configuration conf) {
6062
DatagenParams.readConf(conf);
6163
Dictionaries.loadDictionaries(conf);
6264
SN.initialize();
65+
Person.personSimilarity = new GeoDistanceSimilarity();
6366
initialized = true;
6467
}
6568
}

src/main/java/ldbc/snb/datagen/objects/Knows.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public static boolean createKnow( Random random, Person personA, Person personB
142142
creationDate = creationDate - personA.creationDate() >= DatagenParams.deltaTime ? creationDate : creationDate + (DatagenParams.deltaTime - (creationDate - personA.creationDate()));
143143
creationDate = creationDate - personB.creationDate() >= DatagenParams.deltaTime ? creationDate : creationDate + (DatagenParams.deltaTime - (creationDate - personB.creationDate()));
144144
if( creationDate <= Dictionaries.dates.getEndDateTime() ) {
145-
float similarity = Person.Similarity(personA,personB);
145+
float similarity = Person.personSimilarity.Similarity(personA,personB);
146146
if(!personB.knows().add(new Knows(personA, creationDate, similarity))) return false;
147147
if(!personA.knows().add(new Knows(personB, creationDate, similarity))) return false;
148148
return true;

src/main/java/ldbc/snb/datagen/objects/Person.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
public class Person implements Writable {
1515

1616
public static interface PersonSimilarity {
17-
public double Similarity(Person personA, Person personB);
17+
public float Similarity(Person personA, Person personB);
1818
}
1919

2020
public static class PersonSummary implements Writable {
@@ -467,8 +467,4 @@ public void write(DataOutput arg0) throws IOException {
467467
}
468468

469469
public static PersonSimilarity personSimilarity;
470-
471-
public static float Similarity(Person personA, Person personB) {
472-
}
473-
474470
}

src/main/java/ldbc/snb/datagen/objects/similarity/GeoDistanceSimilarity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Created by aprat on 22/01/16.
88
*/
99
public class GeoDistanceSimilarity implements Person.PersonSimilarity{
10-
public double Similarity(Person personA, Person personB) {
10+
public float Similarity(Person personA, Person personB) {
1111
int zorderA = Dictionaries.places.getZorderID(personA.countryId());
1212
int zorderB = Dictionaries.places.getZorderID(personB.countryId());
1313
return 1.0f - (Math.abs(zorderA - zorderB) / 256.0f);

src/main/java/ldbc/snb/datagen/objects/similarity/InterestsSimilarity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Created by aprat on 22/01/16.
77
*/
88
public class InterestsSimilarity implements Person.PersonSimilarity {
9-
public double Similarity(Person personA, Person personB) {
9+
public float Similarity(Person personA, Person personB) {
1010
return 0;
1111
}
1212
}

0 commit comments

Comments
 (0)