Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[4191] trunk/components-core/src
|
From: <lor...@us...> - 2013-12-03 09:40:18
|
Revision: 4191
http://sourceforge.net/p/dl-learner/code/4191
Author: lorenz_b
Date: 2013-12-03 09:40:14 +0000 (Tue, 03 Dec 2013)
Log Message:
-----------
Made semantic index serializable.
Modified Paths:
--------------
trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/AnnotatedDocument.java
trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/Token.java
trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/TokenTree.java
trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/semantic/SemanticIndex.java
trunk/components-core/src/main/java/org/dllearner/algorithms/isle/metrics/AbstractRelevanceMetric.java
trunk/components-core/src/main/java/org/dllearner/algorithms/isle/metrics/PMIRelevanceMetric.java
trunk/components-core/src/main/java/org/dllearner/algorithms/isle/textretrieval/AnnotationEntityTextRetriever.java
trunk/components-core/src/test/java/org/dllearner/algorithms/isle/Experiment.java
trunk/components-core/src/test/java/org/dllearner/algorithms/isle/ISLETestCorpus.java
trunk/components-core/src/test/java/org/dllearner/algorithms/isle/ISLETestNoCorpus.java
Removed Paths:
-------------
trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/semantic/simple/
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/AnnotatedDocument.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/AnnotatedDocument.java 2013-12-03 09:13:46 UTC (rev 4190)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/AnnotatedDocument.java 2013-12-03 09:40:14 UTC (rev 4191)
@@ -5,13 +5,14 @@
import org.dllearner.core.owl.Entity;
+import java.io.Serializable;
import java.util.Set;
/**
* @author Lorenz Buehmann
*
*/
-public interface AnnotatedDocument extends Document {
+public interface AnnotatedDocument extends Document, Serializable{
/**
* Returns a set of entities which are contained in the document.
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/Token.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/Token.java 2013-12-03 09:13:46 UTC (rev 4190)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/Token.java 2013-12-03 09:40:14 UTC (rev 4191)
@@ -3,15 +3,15 @@
*/
package org.dllearner.algorithms.isle.index;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
+import java.io.Serializable;
+import com.google.common.collect.ComparisonChain;
+
/**
* @author Lorenz Buehmann
*
*/
-public class Token {
+public class Token implements Comparable<Token>, Serializable{
private String rawForm;
private String stemmedForm;
@@ -159,9 +159,9 @@
Token token = (Token) o;
- if (!posTag.equals(token.posTag)) {
- return false;
- }
+// if (!posTag.equals(token.posTag)) {
+// return false;
+// }
if (!stemmedForm.equals(token.stemmedForm)) {
return false;
}
@@ -172,31 +172,18 @@
@Override
public int hashCode() {
int result = stemmedForm.hashCode();
- result = 31 * result + posTag.hashCode();
+// result = 31 * result + posTag.hashCode();
return result;
}
- public static void main(String[] args) {
- Token t1 = new Token("requirement", "requirement", "NN", false, false);
- t1.addAlternativeForm("demand");
- t1.addAlternativeForm("condition");
-
- Token t2 = new Token("demand", "demand", "NN", false, false);
- t2.addAlternativeForm("must");
-
-
- Token t3 = new Token("must", "must", "NN", false, false);
- t1.addAlternativeForm("condition");
-
- Token t4 = new Token("mustache", "mustache", "NN", false, false);
-
-
- Token[] tokens = new Token[]{t1, t2, t3, t4};
-
- for (Token t : tokens) {
- for (Token o : tokens) {
- System.out.println(t + " - " + o + " --> " + t.equalsWithAlternativeForms(o));
- }
- }
- }
+ /* (non-Javadoc)
+ * @see java.lang.Comparable#compareTo(java.lang.Object)
+ */
+ @Override
+ public int compareTo(Token other) {
+ return ComparisonChain.start()
+ .compare(this.rawForm, other.rawForm)
+ .compare(this.posTag, other.posTag)
+ .result();
+ }
}
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/TokenTree.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/TokenTree.java 2013-12-03 09:13:46 UTC (rev 4190)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/TokenTree.java 2013-12-03 09:40:14 UTC (rev 4191)
@@ -48,9 +48,7 @@
curNode.children.put(t, nextNode);
}
curNode = nextNode;
- } else {
- System.out.println("ignored " + t);
- }
+ }
}
curNode.entities.addAll(entities);
curNode.originalTokens = new ArrayList<>(originalTokens);
@@ -195,7 +193,7 @@
}
String indentString = indentStringBuilder.toString();
StringBuilder sb = new StringBuilder();
- for (Map.Entry<Token, TokenTree> e : children.entrySet()) {
+ for (Map.Entry<Token, TokenTree> e : new TreeMap<>(children).entrySet()) {
sb.append(indentString).append(e.getKey().toString());
sb.append("\n");
sb.append(e.getValue().toString(indent + 1));
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/semantic/SemanticIndex.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/semantic/SemanticIndex.java 2013-12-03 09:13:46 UTC (rev 4190)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/semantic/SemanticIndex.java 2013-12-03 09:40:14 UTC (rev 4191)
@@ -2,25 +2,10 @@
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Map;
import java.util.Set;
-import org.apache.log4j.Logger;
-import org.dllearner.algorithms.isle.EntityCandidateGenerator;
-import org.dllearner.algorithms.isle.TextDocumentGenerator;
import org.dllearner.algorithms.isle.index.AnnotatedDocument;
-import org.dllearner.algorithms.isle.index.LinguisticAnnotator;
-import org.dllearner.algorithms.isle.index.SemanticAnnotator;
-import org.dllearner.algorithms.isle.index.TextDocument;
-import org.dllearner.algorithms.isle.index.Token;
-import org.dllearner.algorithms.isle.index.syntactic.SyntacticIndex;
-import org.dllearner.algorithms.isle.wsd.WordSenseDisambiguation;
import org.dllearner.core.owl.Entity;
-import org.semanticweb.owlapi.model.OWLAnnotation;
-import org.semanticweb.owlapi.model.OWLAnnotationProperty;
-import org.semanticweb.owlapi.model.OWLEntity;
-import org.semanticweb.owlapi.model.OWLLiteral;
-import org.semanticweb.owlapi.model.OWLOntology;
/**
* Interface for an index which is able to resolve a given entity's URI to the set of documents containing
@@ -29,106 +14,18 @@
* @author Lorenz Buehmann
* @author Daniel Fleischhacker
*/
-public abstract class SemanticIndex {
+public class SemanticIndex extends HashMap<Entity, Set<AnnotatedDocument>>{
+ private int nrOfDocuments;
- private static final Logger logger = Logger.getLogger(SemanticIndex.class.getName());
-
- private SemanticAnnotator semanticAnnotator;
- private SyntacticIndex syntacticIndex;
- private Map<Entity, Set<AnnotatedDocument>> index;
- private OWLOntology ontology;
-
- private int size = 0;
-
- public SemanticIndex(OWLOntology ontology, SyntacticIndex syntacticIndex, WordSenseDisambiguation wordSenseDisambiguation,
- EntityCandidateGenerator entityCandidateGenerator, LinguisticAnnotator linguisticAnnotator) {
- this.ontology = ontology;
- this.syntacticIndex = syntacticIndex;
- semanticAnnotator = new SemanticAnnotator(wordSenseDisambiguation, entityCandidateGenerator, linguisticAnnotator);
- }
-
- public SemanticIndex(OWLOntology ontology) {
- this.ontology = ontology;
-
- }
-
/**
- * @param semanticAnnotator the semanticAnnotator to set
- */
- public void setSemanticAnnotator(SemanticAnnotator semanticAnnotator) {
- this.semanticAnnotator = semanticAnnotator;
- }
-
- /**
- * Precompute the whole index, i.e. iterate over all entities and compute all annotated documents.
- */
- public void buildIndex(Set<TextDocument> documents) {
- if (semanticAnnotator == null) {
- throw new RuntimeException("No semantic annotator defined, must be set using the setSemanticAnnotator method");
- }
- logger.info("Creating semantic index...");
- index = new HashMap<Entity, Set<AnnotatedDocument>>();
- for (TextDocument document : documents) {
- logger.debug("Processing document:" + document);
- AnnotatedDocument annotatedDocument = semanticAnnotator.processDocument(document);
- for (Entity entity : annotatedDocument.getContainedEntities()) {
- Set<AnnotatedDocument> existingAnnotatedDocuments = index.get(entity);
- if (existingAnnotatedDocuments == null) {
- existingAnnotatedDocuments = new HashSet<AnnotatedDocument>();
- index.put(entity, existingAnnotatedDocuments);
- }
- existingAnnotatedDocuments.add(annotatedDocument);
- }
- logger.debug("Annotated document:" + annotatedDocument);
- }
- size = documents.size();
- logger.info("...done.");
- }
-
- public void buildIndex(OWLAnnotationProperty annotationProperty, String language) {
- Set<OWLEntity> schemaEntities = new HashSet<OWLEntity>();
- schemaEntities.addAll(ontology.getClassesInSignature());
- schemaEntities.addAll(ontology.getObjectPropertiesInSignature());
- schemaEntities.addAll(ontology.getDataPropertiesInSignature());
- Set<TextDocument> documents = new HashSet<TextDocument>();
- for (OWLEntity entity : schemaEntities) {
- String label = null;
- Set<OWLAnnotation> annotations = entity.getAnnotations(ontology, annotationProperty);
- for (OWLAnnotation annotation : annotations) {
- if (annotation.getValue() instanceof OWLLiteral) {
- OWLLiteral val = (OWLLiteral) annotation.getValue();
- if (language != null) {
- if (val.hasLang(language)) {
- label = val.getLiteral();
- }
-
- }
- else {
- label = val.getLiteral();
- }
- }
- }
- if (label != null) {
- documents.add(TextDocumentGenerator.getInstance().generateDocument(label));
- }
- }
- buildIndex(documents);
- }
-
- /**
* Returns the set of annotated documents which reference the given entity using one of its surface forms.
*
* @param entity entity to retrieve documents
* @return documents referencing given entity
*/
public Set<AnnotatedDocument> getDocuments(Entity entity) {
- if (index == null) {
- System.err.println("You have to prebuild the index before you can use this method.");
- System.exit(1);
- }
-
- Set<AnnotatedDocument> annotatedDocuments = index.get(entity);
+ Set<AnnotatedDocument> annotatedDocuments = get(entity);
if (annotatedDocuments == null) {
annotatedDocuments = new HashSet<AnnotatedDocument>();
}
@@ -141,16 +38,22 @@
* @param entity entity to return number of referencing documents for
* @return number of documents for the given entity in this index
*/
- public int count(Entity entity) {
- return index.get(entity).size();
+ public int getNrOfDocumentsFor(Entity entity) {
+ return get(entity).size();
}
+
+ /**
+ * @param nrOfDocuments the nrOfDocuments to set
+ */
+ public void setTotalNrOfDocuments(int nrOfDocuments) {
+ this.nrOfDocuments = nrOfDocuments;
+ }
+
+ /**
+ * @return the nrOfDocuments
+ */
+ public int getTotalNrOfDocuments() {
+ return nrOfDocuments;
+ }
- /**
- * Returns the total number of documents contained in the index.
- *
- * @return the total number of documents contained in the index
- */
- public int getSize() {
- return size;
- }
}
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/isle/metrics/AbstractRelevanceMetric.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/isle/metrics/AbstractRelevanceMetric.java 2013-12-03 09:13:46 UTC (rev 4190)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/isle/metrics/AbstractRelevanceMetric.java 2013-12-03 09:40:14 UTC (rev 4191)
@@ -3,12 +3,12 @@
*/
package org.dllearner.algorithms.isle.metrics;
+import java.util.HashMap;
+import java.util.Map;
+
import org.dllearner.algorithms.isle.index.semantic.SemanticIndex;
import org.semanticweb.owlapi.model.OWLEntity;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* @author Lorenz Buehmann
*
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/isle/metrics/PMIRelevanceMetric.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/isle/metrics/PMIRelevanceMetric.java 2013-12-03 09:13:46 UTC (rev 4190)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/isle/metrics/PMIRelevanceMetric.java 2013-12-03 09:40:14 UTC (rev 4191)
@@ -26,7 +26,7 @@
Set<AnnotatedDocument> documentsA = index.getDocuments(entityA);
Set<AnnotatedDocument> documentsB = index.getDocuments(entityB);
Set<AnnotatedDocument> documentsAB = Sets.intersection(documentsA, documentsB);
- int nrOfDocuments = index.getSize();
+ int nrOfDocuments = index.getTotalNrOfDocuments();
double pA = nrOfDocuments == 0 ? 0 : ((double) documentsA.size() / (double) nrOfDocuments);
double pB = nrOfDocuments == 0 ? 0 : ((double) documentsB.size() / (double) nrOfDocuments);
@@ -42,7 +42,7 @@
Set<AnnotatedDocument> documentsA = index.getDocuments(entityA);
Set<AnnotatedDocument> documentsB = index.getDocuments(entityB);
Set<AnnotatedDocument> documentsAB = Sets.intersection(documentsA, documentsB);
- int nrOfDocuments = index.getSize();
+ int nrOfDocuments = index.getTotalNrOfDocuments();
// System.out.println("A:" + documentsA.size());
// System.out.println("B:" + documentsB.size());
// System.out.println("AB:" + documentsAB.size());
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/isle/textretrieval/AnnotationEntityTextRetriever.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/isle/textretrieval/AnnotationEntityTextRetriever.java 2013-12-03 09:13:46 UTC (rev 4190)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/isle/textretrieval/AnnotationEntityTextRetriever.java 2013-12-03 09:40:14 UTC (rev 4191)
@@ -13,6 +13,7 @@
import org.dllearner.algorithms.isle.index.LinguisticUtil;
import org.dllearner.algorithms.isle.index.Token;
import org.dllearner.core.owl.Entity;
+import org.dllearner.core.owl.NamedClass;
import org.dllearner.kb.OWLAPIOntology;
import org.dllearner.utilities.owl.OWLAPIConverter;
import org.semanticweb.owlapi.model.IRI;
@@ -90,6 +91,9 @@
OWLLiteral val = (OWLLiteral) annotation.getValue();
if (val.hasLang(language)) {
String label = val.getLiteral().trim();
+ if(entity instanceof NamedClass){
+ label = label.toLowerCase();
+ }
textWithWeight.put(TextDocumentGenerator.getInstance().generateDocument(label), weight);
}
}
Modified: trunk/components-core/src/test/java/org/dllearner/algorithms/isle/Experiment.java
===================================================================
--- trunk/components-core/src/test/java/org/dllearner/algorithms/isle/Experiment.java 2013-12-03 09:13:46 UTC (rev 4190)
+++ trunk/components-core/src/test/java/org/dllearner/algorithms/isle/Experiment.java 2013-12-03 09:40:14 UTC (rev 4191)
@@ -4,6 +4,9 @@
package org.dllearner.algorithms.isle;
import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedList;
@@ -16,7 +19,7 @@
import org.dllearner.algorithms.celoe.CELOE;
import org.dllearner.algorithms.isle.index.TextDocument;
import org.dllearner.algorithms.isle.index.semantic.SemanticIndex;
-import org.dllearner.algorithms.isle.index.semantic.simple.SimpleSemanticIndex;
+import org.dllearner.algorithms.isle.index.semantic.SemanticIndexGenerator;
import org.dllearner.algorithms.isle.metrics.PMIRelevanceMetric;
import org.dllearner.algorithms.isle.metrics.RelevanceMetric;
import org.dllearner.algorithms.isle.metrics.RelevanceUtils;
@@ -42,14 +45,13 @@
import org.semanticweb.owlapi.model.OWLClass;
import org.semanticweb.owlapi.model.OWLOntology;
-import com.clarkparsia.sparqlowl.parser.antlr.SparqlOwlParser.whereClause_return;
import com.google.common.collect.Sets;
-import edu.stanford.nlp.ling.CoreLabel;
import edu.stanford.nlp.ling.CoreAnnotations.PartOfSpeechAnnotation;
import edu.stanford.nlp.ling.CoreAnnotations.SentencesAnnotation;
import edu.stanford.nlp.ling.CoreAnnotations.TextAnnotation;
import edu.stanford.nlp.ling.CoreAnnotations.TokensAnnotation;
+import edu.stanford.nlp.ling.CoreLabel;
import edu.stanford.nlp.pipeline.Annotation;
import edu.stanford.nlp.pipeline.StanfordCoreNLP;
import edu.stanford.nlp.util.CoreMap;
@@ -138,8 +140,15 @@
documents = getDocuments();
// build semantic index
- SemanticIndex semanticIndex = new SimpleSemanticIndex(ontology, null, false);
- semanticIndex.buildIndex(documents);
+ SemanticIndex semanticIndex = SemanticIndexGenerator.generateIndex(documents, ontology, false);
+ try {
+ ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream("semantic-index.ser"));
+ oos.writeObject(semanticIndex);
+ oos.close();
+ } catch (IOException e1) {
+ e1.printStackTrace();
+ }
+
// set the relevance metric
relevance = new PMIRelevanceMetric(semanticIndex);
try {
Modified: trunk/components-core/src/test/java/org/dllearner/algorithms/isle/ISLETestCorpus.java
===================================================================
--- trunk/components-core/src/test/java/org/dllearner/algorithms/isle/ISLETestCorpus.java 2013-12-03 09:13:46 UTC (rev 4190)
+++ trunk/components-core/src/test/java/org/dllearner/algorithms/isle/ISLETestCorpus.java 2013-12-03 09:40:14 UTC (rev 4191)
@@ -3,16 +3,28 @@
*/
package org.dllearner.algorithms.isle;
-import com.google.common.base.Charsets;
-import com.google.common.base.Joiner;
-import com.google.common.io.Files;
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.text.DecimalFormat;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import org.dllearner.algorithms.celoe.CELOE;
-import org.dllearner.algorithms.isle.index.*;
+import org.dllearner.algorithms.isle.index.AnnotatedDocument;
+import org.dllearner.algorithms.isle.index.EntityCandidatesTrie;
+import org.dllearner.algorithms.isle.index.LinguisticAnnotator;
+import org.dllearner.algorithms.isle.index.RemoteDataProvider;
+import org.dllearner.algorithms.isle.index.SemanticAnnotator;
+import org.dllearner.algorithms.isle.index.SimpleEntityCandidatesTrie;
+import org.dllearner.algorithms.isle.index.TextDocument;
+import org.dllearner.algorithms.isle.index.Token;
+import org.dllearner.algorithms.isle.index.TrieEntityCandidateGenerator;
+import org.dllearner.algorithms.isle.index.TrieLinguisticAnnotator;
import org.dllearner.algorithms.isle.index.semantic.SemanticIndex;
-import org.dllearner.algorithms.isle.index.semantic.simple.SimpleSemanticIndex;
-import org.dllearner.algorithms.isle.index.syntactic.SyntacticIndex;
-import org.dllearner.algorithms.isle.index.syntactic.TextDocumentSyntacticIndexCreator;
+import org.dllearner.algorithms.isle.index.semantic.SemanticIndexGenerator;
import org.dllearner.algorithms.isle.metrics.PMIRelevanceMetric;
import org.dllearner.algorithms.isle.metrics.RelevanceMetric;
import org.dllearner.algorithms.isle.metrics.RelevanceUtils;
@@ -31,18 +43,17 @@
import org.junit.Before;
import org.junit.Test;
import org.semanticweb.owlapi.apibinding.OWLManager;
-import org.semanticweb.owlapi.model.*;
+import org.semanticweb.owlapi.model.IRI;
+import org.semanticweb.owlapi.model.OWLDataFactory;
+import org.semanticweb.owlapi.model.OWLEntity;
+import org.semanticweb.owlapi.model.OWLOntology;
+import org.semanticweb.owlapi.model.OWLOntologyManager;
import uk.ac.manchester.cs.owl.owlapi.OWLDataFactoryImpl;
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.text.DecimalFormat;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import com.google.common.base.Charsets;
+import com.google.common.base.Joiner;
+import com.google.common.io.Files;
/**
* Some tests for the ISLE algorithm.
@@ -59,7 +70,6 @@
private RelevanceMetric relevance;
private String searchField = "label";
private SemanticIndex semanticIndex;
- private SyntacticIndex syntacticIndex;
// we assume that the ontology is named "ontology.owl" and that all text files
// are in a subdirectory called "corpus"
@@ -78,7 +88,6 @@
textRetriever = new RDFSLabelEntityTextRetriever(ontology);
RemoteDataProvider chapterIndexProvider = new RemoteDataProvider(
new URL("http://gold.linkeddata.org/data/bible/chapter_index.zip"));
- syntacticIndex = TextDocumentSyntacticIndexCreator.loadIndex(chapterIndexProvider.getLocalDirectory());
}
private Set<TextDocument> createDocuments(){
@@ -139,18 +148,8 @@
}
@Test
- public void testSemanticIndexAnnotationProperty(){
- semanticIndex = new SimpleSemanticIndex(ontology, syntacticIndex);
- semanticIndex.buildIndex(df.getRDFSLabel(), null);
-// NamedClass nc = new NamedClass("http://example.com/father#father");
- Set<AnnotatedDocument> documents = semanticIndex.getDocuments(cls);
- System.out.println("Documents for " + cls + ":\n" + documents);
- }
-
- @Test
public void testSemanticIndexCorpus(){
- semanticIndex = new SimpleSemanticIndex(ontology, syntacticIndex);
- semanticIndex.buildIndex(createDocuments());
+ semanticIndex = SemanticIndexGenerator.generateIndex(createDocuments(), ontology, false);
Set<AnnotatedDocument> documents = semanticIndex.getDocuments(cls);
System.out.println(documents);
relevance = new PMIRelevanceMetric(semanticIndex);
@@ -169,8 +168,7 @@
lp.setClassToDescribe(cls);
lp.init();
- semanticIndex = new SimpleSemanticIndex(ontology, syntacticIndex);
- semanticIndex.buildIndex(createBibleDocuments());
+ semanticIndex = SemanticIndexGenerator.generateIndex(createBibleDocuments(), ontology, false);
relevance = new PMIRelevanceMetric(semanticIndex);
@@ -227,8 +225,7 @@
lp.setClassToDescribe(cls);
lp.init();
- semanticIndex = new SimpleSemanticIndex(ontology, syntacticIndex, false);
- semanticIndex.buildIndex(createBibleDocuments());
+ semanticIndex = SemanticIndexGenerator.generateIndex(createBibleDocuments(), ontology, false);
relevance = new PMIRelevanceMetric(semanticIndex);
Modified: trunk/components-core/src/test/java/org/dllearner/algorithms/isle/ISLETestNoCorpus.java
===================================================================
--- trunk/components-core/src/test/java/org/dllearner/algorithms/isle/ISLETestNoCorpus.java 2013-12-03 09:13:46 UTC (rev 4190)
+++ trunk/components-core/src/test/java/org/dllearner/algorithms/isle/ISLETestNoCorpus.java 2013-12-03 09:40:14 UTC (rev 4191)
@@ -4,7 +4,7 @@
import java.util.Map;
import org.dllearner.algorithms.isle.index.semantic.SemanticIndex;
-import org.dllearner.algorithms.isle.index.semantic.simple.SimpleSemanticIndex;
+import org.dllearner.algorithms.isle.index.semantic.SemanticIndexGenerator;
import org.dllearner.algorithms.isle.index.syntactic.OWLOntologyLuceneSyntacticIndexCreator;
import org.dllearner.algorithms.isle.index.syntactic.SyntacticIndex;
import org.dllearner.algorithms.isle.metrics.PMIRelevanceMetric;
@@ -65,8 +65,7 @@
lp.setClassToDescribe(cls);
lp.init();
- semanticIndex = new SimpleSemanticIndex(ontology, syntacticIndex);
- semanticIndex.buildIndex(df.getOWLAnnotationProperty(OWLRDFVocabulary.RDFS_COMMENT.getIRI()), null);
+ semanticIndex = SemanticIndexGenerator.generateIndex(ontology, df.getOWLAnnotationProperty(OWLRDFVocabulary.RDFS_COMMENT.getIRI()), null, false);
// semanticIndex = new SimpleSemanticIndex(ontology, syntacticIndex);
// semanticIndex.buildIndex(createDocuments());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
