Reduced this vocabulary memory usage : - by using only one map term2entries instead of two maps having the same key set - by generating the location object links on the fly using the GeoLocation data instead of storing many duplicates of string prefix "http://www.openstreetmap.org/?lat=" Measurements with VisualVM and GeoNames 0 enabled (cities with a population > 1000) : - AutotaggingLibrary retained size : - initial : 309 718 763 bytes - after refactoring : 159 224 641 bytespull/97/head
luccioman
8 years ago
parent
9c06e752e4
commit
a1f922b34a
@ -0,0 +1,53 @@
|
||||
// LocationTaggingEntry.java
|
||||
// Copyright 2016 by luccioman; https://github.com/luccioman
|
||||
//
|
||||
// This is a part of YaCy, a peer-to-peer based web search engine
|
||||
//
|
||||
// LICENSE
|
||||
//
|
||||
// This program is free software; you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation; either version 2 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
package net.yacy.cora.lod.vocabulary;
|
||||
|
||||
import net.yacy.cora.geo.GeoLocation;
|
||||
|
||||
/**
|
||||
* Entry with a synonym and a location for a term in the {@link Tagging} class.
|
||||
*/
|
||||
class LocationTaggingEntry extends SynonymTaggingEntry {
|
||||
|
||||
/** Geographical location of the object */
|
||||
private GeoLocation location;
|
||||
|
||||
/**
|
||||
*
|
||||
* @param synonym term synonym
|
||||
* @param location geographical location of the object. Must not be null.
|
||||
* @throws IllegalArgumentException when a parameter is null
|
||||
*/
|
||||
public LocationTaggingEntry(String synonym, GeoLocation location) {
|
||||
super(synonym);
|
||||
if(location == null) {
|
||||
throw new IllegalArgumentException("location must not be null");
|
||||
}
|
||||
this.location = location;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getObjectLink() {
|
||||
return "http://www.openstreetmap.org/?lat=" + location.lat() + "&lon=" + location.lon() + "&zoom=16";
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,54 @@
|
||||
// SynonymTaggingEntry.java
|
||||
// Copyright 2016 by luccioman; https://github.com/luccioman
|
||||
//
|
||||
// This is a part of YaCy, a peer-to-peer based web search engine
|
||||
//
|
||||
// LICENSE
|
||||
//
|
||||
// This program is free software; you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation; either version 2 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
package net.yacy.cora.lod.vocabulary;
|
||||
|
||||
/**
|
||||
* Synonym entry for a term in the {@link Tagging} class
|
||||
*/
|
||||
class SynonymTaggingEntry implements TaggingEntry {
|
||||
|
||||
/** Term synonym */
|
||||
protected String synonym;
|
||||
|
||||
|
||||
/**
|
||||
* @param synonym a term synonym
|
||||
* @throws IllegalArgumentException when synonym is null
|
||||
*/
|
||||
public SynonymTaggingEntry(String synonym) {
|
||||
if(synonym == null) {
|
||||
throw new IllegalArgumentException("synonym must not be null");
|
||||
}
|
||||
this.synonym = synonym;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getSynonym() {
|
||||
return synonym;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getObjectLink() {
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,39 @@
|
||||
// TaggingEntry.java
|
||||
// Copyright 2016 by luccioman; https://github.com/luccioman
|
||||
//
|
||||
// This is a part of YaCy, a peer-to-peer based web search engine
|
||||
//
|
||||
// LICENSE
|
||||
//
|
||||
// This program is free software; you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation; either version 2 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
package net.yacy.cora.lod.vocabulary;
|
||||
|
||||
/**
|
||||
* Data entry for a term in the {@link Tagging} class
|
||||
*/
|
||||
interface TaggingEntry {
|
||||
|
||||
/**
|
||||
* @return the term synonym
|
||||
*/
|
||||
public String getSynonym();
|
||||
|
||||
/**
|
||||
* @return the term eventual object link
|
||||
*/
|
||||
public String getObjectLink();
|
||||
|
||||
}
|
||||
@ -0,0 +1,50 @@
|
||||
// TaggingEntryWithObjectLink.java
|
||||
// Copyright 2016 by luccioman; https://github.com/luccioman
|
||||
//
|
||||
// This is a part of YaCy, a peer-to-peer based web search engine
|
||||
//
|
||||
// LICENSE
|
||||
//
|
||||
// This program is free software; you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation; either version 2 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
package net.yacy.cora.lod.vocabulary;
|
||||
|
||||
/**
|
||||
* Entry with a synonym and an object link for a term in the {@link Tagging} class.
|
||||
*/
|
||||
class TaggingEntryWithObjectLink extends SynonymTaggingEntry {
|
||||
|
||||
/** URL related to object corresponding to the term */
|
||||
private String objectLink;
|
||||
|
||||
/**
|
||||
* @param synonym a term synonym
|
||||
* @param objectLink URL related to object corresponding to the term
|
||||
* @throws IllegalArgumentException when a parameter is null
|
||||
*/
|
||||
public TaggingEntryWithObjectLink(String synonym, String objectLink) {
|
||||
super(synonym);
|
||||
if(objectLink == null) {
|
||||
throw new IllegalArgumentException("object link must not be null");
|
||||
}
|
||||
this.objectLink = objectLink;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getObjectLink() {
|
||||
return objectLink;
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in new issue