Skip to content

Commit 60ab151

Browse files
miratepuffinmiratepuffin
committed
For Queen and Country
1 parent 47f1c15 commit 60ab151

File tree

9 files changed

+52
-52
lines changed

9 files changed

+52
-52
lines changed

‎src/main/java/ldbc/snb/datagen/hadoop/serializer/HadoopStaticSerializer.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3838
import ldbc.snb.datagen.dictionary.Dictionaries;
3939
import ldbc.snb.datagen.DatagenParams;
4040
import ldbc.snb.datagen.LDBCDatagen;
41-
import ldbc.snb.datagen.objects.Organization;
41+
import ldbc.snb.datagen.objects.Organisation;
4242
import ldbc.snb.datagen.objects.Place;
4343
import ldbc.snb.datagen.objects.Tag;
4444
import ldbc.snb.datagen.objects.TagClass;
@@ -123,9 +123,9 @@ public void exportOrganizations() {
123123
Set<Long> companies = Dictionaries.companies.getCompanies();
124124
Iterator<Long> it = companies.iterator();
125125
while (it.hasNext()) {
126-
Organization company = new Organization();
126+
Organisation company = new Organisation();
127127
company.id = it.next();
128-
company.type = Organization.OrganisationType.company;
128+
company.type = Organisation.OrganisationType.company;
129129
company.name = StringUtils.clampString(Dictionaries.companies.getCompanyName(company.id), 256);
130130
company.location = Dictionaries.companies.getCountry(company.id);
131131
staticSerializer_[nextFile()].export(company);
@@ -134,9 +134,9 @@ public void exportOrganizations() {
134134
Set<Long> universities = Dictionaries.universities.getUniversities();
135135
it = universities.iterator();
136136
while (it.hasNext()) {
137-
Organization university = new Organization();
137+
Organisation university = new Organisation();
138138
university.id = it.next();
139-
university.type = Organization.OrganisationType.university;
139+
university.type = Organisation.OrganisationType.university;
140140
university.name = StringUtils.clampString(Dictionaries.universities.getUniversityName(university.id), 256);
141141
university.location = Dictionaries.universities.getUniversityCity(university.id);
142142
staticSerializer_[nextFile()].export(university);

‎src/main/java/ldbc/snb/datagen/objects/Organization.java renamed to ‎src/main/java/ldbc/snb/datagen/objects/Organisation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3737

3838
package ldbc.snb.datagen.objects;
3939

40-
public class Organization {
40+
public class Organisation {
4141

4242
public enum OrganisationType {
4343
university,

‎src/main/java/ldbc/snb/datagen/serializer/StaticSerializer.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3535
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.*/
3636
package ldbc.snb.datagen.serializer;
3737

38-
import ldbc.snb.datagen.objects.Organization;
38+
import ldbc.snb.datagen.objects.Organisation;
3939
import ldbc.snb.datagen.objects.Place;
4040
import ldbc.snb.datagen.objects.Tag;
4141
import ldbc.snb.datagen.objects.TagClass;
@@ -59,8 +59,8 @@ public void export(final Place place) {
5959
serialize(place);
6060
}
6161

62-
public void export(final Organization organization) {
63-
serialize(organization);
62+
public void export(final Organisation organisation) {
63+
serialize(organisation);
6464
}
6565

6666
public void export(final Tag tag) {
@@ -73,7 +73,7 @@ public void export(final Tag tag) {
7373

7474
abstract protected void serialize(final Place place);
7575

76-
abstract protected void serialize(final Organization organization);
76+
abstract protected void serialize(final Organisation organisation);
7777

7878
abstract protected void serialize(final TagClass tagClass);
7979

‎src/main/java/ldbc/snb/datagen/serializer/empty/EmptyStaticSerializer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3535
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.*/
3636
package ldbc.snb.datagen.serializer.empty;
3737

38-
import ldbc.snb.datagen.objects.Organization;
38+
import ldbc.snb.datagen.objects.Organisation;
3939
import ldbc.snb.datagen.objects.Place;
4040
import ldbc.snb.datagen.objects.Tag;
4141
import ldbc.snb.datagen.objects.TagClass;
@@ -65,7 +65,7 @@ protected void serialize(final Place place) {
6565
}
6666

6767
@Override
68-
protected void serialize(final Organization organization) {
68+
protected void serialize(final Organisation organisation) {
6969
//Intentionally left empty
7070

7171
}

‎src/main/java/ldbc/snb/datagen/serializer/snb/csv/basic/CSVStaticSerializer.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3636
package ldbc.snb.datagen.serializer.snb.csv.basic;
3737

3838
import ldbc.snb.datagen.dictionary.Dictionaries;
39-
import ldbc.snb.datagen.objects.Organization;
39+
import ldbc.snb.datagen.objects.Organisation;
4040
import ldbc.snb.datagen.objects.Place;
4141
import ldbc.snb.datagen.objects.Tag;
4242
import ldbc.snb.datagen.objects.TagClass;
@@ -159,17 +159,17 @@ protected void serialize(final Place place) {
159159
}
160160
}
161161

162-
protected void serialize(final Organization organization) {
162+
protected void serialize(final Organisation organisation) {
163163
ArrayList<String> arguments = new ArrayList<String>();
164-
arguments.add(Long.toString(organization.id));
165-
arguments.add(organization.type.toString());
166-
arguments.add(organization.name);
167-
arguments.add(DBP.getUrl(organization.name));
164+
arguments.add(Long.toString(organisation.id));
165+
arguments.add(organisation.type.toString());
166+
arguments.add(organisation.name);
167+
arguments.add(DBP.getUrl(organisation.name));
168168
writers[FileNames.ORGANIZATION.ordinal()].writeEntry(arguments);
169169

170170
arguments.clear();
171-
arguments.add(Long.toString(organization.id));
172-
arguments.add(Integer.toString(organization.location));
171+
arguments.add(Long.toString(organisation.id));
172+
arguments.add(Integer.toString(organisation.location));
173173
writers[FileNames.ORGANIZATION_IS_LOCATED_IN_PLACE.ordinal()].writeEntry(arguments);
174174
}
175175

‎src/main/java/ldbc/snb/datagen/serializer/snb/csv/composite/CSVCompositeStaticSerializer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3535
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.*/
3636
package ldbc.snb.datagen.serializer.snb.csv.composite;
3737

38-
import ldbc.snb.datagen.objects.Organization;
38+
import ldbc.snb.datagen.objects.Organisation;
3939
import ldbc.snb.datagen.objects.Place;
4040
import ldbc.snb.datagen.objects.Tag;
4141
import ldbc.snb.datagen.objects.TagClass;
@@ -68,8 +68,8 @@ protected void serialize(final Place place) {
6868
}
6969

7070
@Override
71-
protected void serialize(final Organization organization) {
72-
staticSerializer.export(organization);
71+
protected void serialize(final Organisation organisation) {
72+
staticSerializer.export(organisation);
7373
}
7474

7575
@Override

‎src/main/java/ldbc/snb/datagen/serializer/snb/csv/compositemergeforeign/CSVCompositeMergeForeignStaticSerializer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3535
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.*/
3636
package ldbc.snb.datagen.serializer.snb.csv.compositemergeforeign;
3737

38-
import ldbc.snb.datagen.objects.Organization;
38+
import ldbc.snb.datagen.objects.Organisation;
3939
import ldbc.snb.datagen.objects.Place;
4040
import ldbc.snb.datagen.objects.Tag;
4141
import ldbc.snb.datagen.objects.TagClass;
@@ -68,8 +68,8 @@ protected void serialize(final Place place) {
6868
}
6969

7070
@Override
71-
protected void serialize(final Organization organization) {
72-
staticSerializer.export(organization);
71+
protected void serialize(final Organisation organisation) {
72+
staticSerializer.export(organisation);
7373
}
7474

7575
@Override

‎src/main/java/ldbc/snb/datagen/serializer/snb/csv/mergeforeign/CSVMergeForeignStaticSerializer.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3636
package ldbc.snb.datagen.serializer.snb.csv.mergeforeign;
3737

3838
import ldbc.snb.datagen.dictionary.Dictionaries;
39-
import ldbc.snb.datagen.objects.Organization;
39+
import ldbc.snb.datagen.objects.Organisation;
4040
import ldbc.snb.datagen.objects.Place;
4141
import ldbc.snb.datagen.objects.Tag;
4242
import ldbc.snb.datagen.objects.TagClass;
@@ -142,13 +142,13 @@ protected void serialize(final Place place) {
142142

143143
}
144144

145-
protected void serialize(final Organization organization) {
145+
protected void serialize(final Organisation organisation) {
146146
ArrayList<String> arguments = new ArrayList<String>();
147-
arguments.add(Long.toString(organization.id));
148-
arguments.add(organization.type.toString());
149-
arguments.add(organization.name);
150-
arguments.add(DBP.getUrl(organization.name));
151-
arguments.add(Integer.toString(organization.location));
147+
arguments.add(Long.toString(organisation.id));
148+
arguments.add(organisation.type.toString());
149+
arguments.add(organisation.name);
150+
arguments.add(DBP.getUrl(organisation.name));
151+
arguments.add(Integer.toString(organisation.location));
152152
writers[FileNames.ORGANIZATION.ordinal()].writeEntry(arguments);
153153
}
154154

‎src/main/java/ldbc/snb/datagen/serializer/snb/turtle/TurtleStaticSerializer.java

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3636
package ldbc.snb.datagen.serializer.snb.turtle;
3737

3838
import ldbc.snb.datagen.dictionary.Dictionaries;
39-
import ldbc.snb.datagen.objects.Organization;
39+
import ldbc.snb.datagen.objects.Organisation;
4040
import ldbc.snb.datagen.objects.Place;
4141
import ldbc.snb.datagen.objects.Tag;
4242
import ldbc.snb.datagen.objects.TagClass;
@@ -116,32 +116,32 @@ protected void serialize(final Place place) {
116116
}
117117

118118
@Override
119-
protected void serialize(final Organization organization) {
119+
protected void serialize(final Organisation organisation) {
120120
StringBuffer result = new StringBuffer(19000);
121-
if (organization.type == Organization.OrganisationType.company) {
121+
if (organisation.type == Organisation.OrganisationType.company) {
122122
Turtle.writeDBPData(writers[FileNames.SOCIAL_NETWORK.ordinal()], SN
123-
.getCompURI(organization.id), RDF.type, DBPOWL.Company);
123+
.getCompURI(organisation.id), RDF.type, DBPOWL.Company);
124124
Turtle.writeDBPData(writers[FileNames.SOCIAL_NETWORK.ordinal()], SN
125-
.getCompURI(organization.id), SNVOC.url, DBP.fullPrefixed(organization.name));
126-
Turtle.writeDBPData(writers[FileNames.SOCIAL_NETWORK.ordinal()], SN.getCompURI(organization.id), FOAF.Name,
127-
Turtle.createLiteral(organization.name));
128-
Turtle.createTripleSPO(result, SN.getCompURI(organization.id),
125+
.getCompURI(organisation.id), SNVOC.url, DBP.fullPrefixed(organisation.name));
126+
Turtle.writeDBPData(writers[FileNames.SOCIAL_NETWORK.ordinal()], SN.getCompURI(organisation.id), FOAF.Name,
127+
Turtle.createLiteral(organisation.name));
128+
Turtle.createTripleSPO(result, SN.getCompURI(organisation.id),
129129
SNVOC.locatedIn, DBP
130-
.fullPrefixed(Dictionaries.places.getPlaceName(organization.location)));
131-
Turtle.createTripleSPO(result, SN.getCompURI(organization.id), SNVOC.id,
132-
Turtle.createDataTypeLiteral(Long.toString(organization.id), XSD.Int));
130+
.fullPrefixed(Dictionaries.places.getPlaceName(organisation.location)));
131+
Turtle.createTripleSPO(result, SN.getCompURI(organisation.id), SNVOC.id,
132+
Turtle.createDataTypeLiteral(Long.toString(organisation.id), XSD.Int));
133133
} else {
134134
Turtle.writeDBPData(writers[FileNames.SOCIAL_NETWORK.ordinal()], SN
135-
.getUnivURI(organization.id), RDF.type, DBPOWL.University);
135+
.getUnivURI(organisation.id), RDF.type, DBPOWL.University);
136136
Turtle.writeDBPData(writers[FileNames.SOCIAL_NETWORK.ordinal()], SN
137-
.getUnivURI(organization.id), SNVOC.url, DBP.fullPrefixed(organization.name));
138-
Turtle.writeDBPData(writers[FileNames.SOCIAL_NETWORK.ordinal()], SN.getUnivURI(organization.id), FOAF.Name,
139-
Turtle.createLiteral(organization.name));
140-
Turtle.createTripleSPO(result, SN.getUnivURI(organization.id),
137+
.getUnivURI(organisation.id), SNVOC.url, DBP.fullPrefixed(organisation.name));
138+
Turtle.writeDBPData(writers[FileNames.SOCIAL_NETWORK.ordinal()], SN.getUnivURI(organisation.id), FOAF.Name,
139+
Turtle.createLiteral(organisation.name));
140+
Turtle.createTripleSPO(result, SN.getUnivURI(organisation.id),
141141
SNVOC.locatedIn, DBP
142-
.fullPrefixed(Dictionaries.places.getPlaceName(organization.location)));
143-
Turtle.createTripleSPO(result, SN.getUnivURI(organization.id), SNVOC.id,
144-
Turtle.createDataTypeLiteral(Long.toString(organization.id), XSD.Int));
142+
.fullPrefixed(Dictionaries.places.getPlaceName(organisation.location)));
143+
Turtle.createTripleSPO(result, SN.getUnivURI(organisation.id), SNVOC.id,
144+
Turtle.createDataTypeLiteral(Long.toString(organisation.id), XSD.Int));
145145
}
146146

147147
writers[FileNames.SOCIAL_NETWORK.ordinal()].write(result.toString());

0 commit comments

Comments
 (0)