Menu
▾
▴
dl-learner-svn — DL-Learner Subversion commits
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(120) |
Sep
(36) |
Oct
(116) |
Nov
(17) |
Dec
(44) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(143) |
Feb
(192) |
Mar
(74) |
Apr
(84) |
May
(105) |
Jun
(64) |
Jul
(49) |
Aug
(120) |
Sep
(159) |
Oct
(156) |
Nov
(51) |
Dec
(28) |
| 2009 |
Jan
(17) |
Feb
(55) |
Mar
(33) |
Apr
(57) |
May
(54) |
Jun
(28) |
Jul
(6) |
Aug
(16) |
Sep
(38) |
Oct
(30) |
Nov
(26) |
Dec
(52) |
| 2010 |
Jan
(7) |
Feb
(91) |
Mar
(65) |
Apr
(2) |
May
(14) |
Jun
(25) |
Jul
(38) |
Aug
(48) |
Sep
(80) |
Oct
(70) |
Nov
(75) |
Dec
(77) |
| 2011 |
Jan
(68) |
Feb
(53) |
Mar
(51) |
Apr
(35) |
May
(65) |
Jun
(101) |
Jul
(29) |
Aug
(230) |
Sep
(95) |
Oct
(49) |
Nov
(110) |
Dec
(63) |
| 2012 |
Jan
(41) |
Feb
(42) |
Mar
(25) |
Apr
(46) |
May
(51) |
Jun
(44) |
Jul
(45) |
Aug
(29) |
Sep
(12) |
Oct
(9) |
Nov
(17) |
Dec
(2) |
| 2013 |
Jan
(12) |
Feb
(14) |
Mar
(7) |
Apr
(16) |
May
(54) |
Jun
(27) |
Jul
(11) |
Aug
(5) |
Sep
(85) |
Oct
(27) |
Nov
(37) |
Dec
(32) |
| 2014 |
Jan
(8) |
Feb
(29) |
Mar
(5) |
Apr
(3) |
May
(22) |
Jun
(3) |
Jul
(4) |
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sk...@us...> - 2008-10-28 13:45:26
|
Revision: 1474
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1474&view=rev
Author: sknappe
Date: 2008-10-28 10:24:19 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
bugfix
Modified Paths:
--------------
trunk/src/dbpedia-navigator/ajax_get_subjects_from_concept.php
Modified: trunk/src/dbpedia-navigator/ajax_get_subjects_from_concept.php
===================================================================
--- trunk/src/dbpedia-navigator/ajax_get_subjects_from_concept.php 2008-10-28 10:22:25 UTC (rev 1473)
+++ trunk/src/dbpedia-navigator/ajax_get_subjects_from_concept.php 2008-10-28 10:24:19 UTC (rev 1474)
@@ -64,7 +64,7 @@
for ($j=1;$j<$i-1;$j++)
$temp.='cat'.$j.'.name=cat'.($j+1).'.name AND ';
- $query=$temp.'('.$final.') ORDER BY number LIMIT '.$number;
+ $query=$temp.'('.$final.') ORDER BY number DESC LIMIT '.$number;
$res=$databaseConnection->query($query);
$bestsearches="";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sk...@us...> - 2008-10-28 13:45:06
|
Revision: 1469
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1469&view=rev
Author: sknappe
Date: 2008-10-28 10:10:34 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
new negativeExampleFinder using database
Modified Paths:
--------------
trunk/src/dbpedia-navigator/DLLearnerConnection.php
trunk/src/dbpedia-navigator/helper_functions.php
Modified: trunk/src/dbpedia-navigator/DLLearnerConnection.php
===================================================================
--- trunk/src/dbpedia-navigator/DLLearnerConnection.php 2008-10-28 09:18:33 UTC (rev 1468)
+++ trunk/src/dbpedia-navigator/DLLearnerConnection.php 2008-10-28 10:10:34 UTC (rev 1469)
@@ -53,6 +53,7 @@
function getConceptFromExamples($posExamples,$negExamples,$number)
{
require_once("Settings.php");
+ require_once("helper_functions.php");
$settings=new Settings();
$this->client->applyConfigEntryInt($this->id, $this->ksID, "recursionDepth",1);
@@ -61,10 +62,11 @@
$this->client->applyConfigEntryString($this->id, $this->ksID, "predefinedManipulator", "DBPEDIA-NAVIGATOR");
$this->client->applyConfigEntryBoolean($this->id, $this->ksID, "useCache", true);
if(empty($negExamples)){
- if ($settings->classSystem=="YAGO") $filterClasses=array("http://xmlns.com/foaf/","http://dbpedia.org/ontology/");
+ /*if ($settings->classSystem=="YAGO") $filterClasses=array("http://xmlns.com/foaf/","http://dbpedia.org/ontology/");
else if ($settings->classSystem=="DBpedia") $filterClasses=array("http://xmlns.com/foaf/","http://dbpedia.org/class/yago/","http://dbpedia.org/ontology/Resource");
$negExamples=$this->client->getNegativeExamples($this->id,$this->ksID,$posExamples,count($posExamples),"http://dbpedia.org/resource/",$filterClasses);
- $negExamples=$negExamples->item;
+ $negExamples=$negExamples->item;*/
+ $negExamples=getNegativeExamplesFromParallelClass($posExamples);
}
$this->client->applyConfigEntryStringArray($this->id, $this->ksID, "instances", array_merge($posExamples,$negExamples));
$this->client->setReasoner($this->id, "fastInstanceChecker");
Modified: trunk/src/dbpedia-navigator/helper_functions.php
===================================================================
--- trunk/src/dbpedia-navigator/helper_functions.php 2008-10-28 09:18:33 UTC (rev 1468)
+++ trunk/src/dbpedia-navigator/helper_functions.php 2008-10-28 10:10:34 UTC (rev 1469)
@@ -616,4 +616,51 @@
if (isset($triples['http://dbpedia.org/property/utcDst'])) unset($triples['http://dbpedia.org/property/utcDst']);
if (isset($triples['http://dbpedia.org/property/spokenWikipedia2Property'])) unset($triples['http://dbpedia.org/property/spokenWikipedia2Property']);
}
+
+public function getNegativeExamplesFromParallelClass($posExamples){
+ include_once('Settings.php');
+ include_once('DatabaseConnection.php');
+ //connect to the database
+ $settings=new Settings();
+ $databaseConnection=new DatabaseConnection($settings->database_type);
+ $databaseConnection->connect($settings->database_server,$settings->database_user,$settings->database_pass);
+ $databaseConnection->select_database($settings->database_name);
+
+ $examples=array();
+ foreach ($posExamples as $pos){
+ $query="SELECT category FROM articlecategories WHERE name='".$pos."' AND category!='http://dbpedia.org/ontology/Resource'";
+ $res=$databaseConnection->query($query);
+ if ($databaseConnection->numberOfEntries($res)>0) $zufall = rand(1,$databaseConnection->numberOfEntries($res));
+ $i=1;
+ while ($result=$databaseConnection->nextEntry($res)){
+ if ($i==$zufall) $class=$result['category'];
+ $i++;
+ }
+ $query="SELECT father FROM classhierarchy WHERE child='".$class."'";
+ $res=$databaseConnection->query($query);
+ if ($databaseConnection->numberOfEntries($res)>0) $zufall = rand(1,$databaseConnection->numberOfEntries($res));
+ $i=1;
+ while ($result=$databaseConnection->nextEntry($res)){
+ if ($i==$zufall) $father=$result['father'];
+ $i++;
+ }
+
+ $query="SELECT child FROM classhierarchy WHERE father='".$father."' AND child!='".$class."'";
+ $res=$databaseConnection->query($query);
+ if ($databaseConnection->numberOfEntries($res)>0) $zufall = rand(1,$databaseConnection->numberOfEntries($res));
+ $i=1;
+ while ($result=$databaseConnection->nextEntry($res)){
+ if ($i==$zufall) $child=$result['child'];
+ $i++;
+ }
+ $query="SELECT name FROM articlecategories WHERE category='".$child."' AND name!='".$pos."' ORDER BY RAND() LIMIT 1";
+ $res=$databaseConnection->query($query);
+ if ($databaseConnection->numberOfEntries($res)>0){
+ $result=$databaseConnection->nextEntry($res);
+ $examples[]=$result['name'];
+ }
+ }
+
+ return $examples;
+}
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Jen...@us...> - 2008-10-28 13:43:23
|
Revision: 1475
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1475&view=rev
Author: JensLehmann
Date: 2008-10-28 10:50:04 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
integrated city and person template
Modified Paths:
--------------
trunk/src/dbpedia-navigator/ajax_get_article.php
trunk/src/dbpedia-navigator/templates/AbstractTemplate.php
trunk/src/dbpedia-navigator/templates/CityTemplate.php
trunk/src/dbpedia-navigator/templates/DefaultTemplate.php
trunk/src/dbpedia-navigator/templates/PersonTemplate.php
trunk/src/dbpedia-navigator/templates/PlaceTemplate.php
Modified: trunk/src/dbpedia-navigator/ajax_get_article.php
===================================================================
--- trunk/src/dbpedia-navigator/ajax_get_article.php 2008-10-28 10:24:19 UTC (rev 1474)
+++ trunk/src/dbpedia-navigator/ajax_get_article.php 2008-10-28 10:50:04 UTC (rev 1475)
@@ -259,14 +259,22 @@
$pages=substr($pages,0,strlen($pages)-2);
$content.='<br/><hr><h4>Wikipedia articles in different languages</h4><br/><p>'.$pages.'</p>';
}
+
+ $content .= '<br/><hr><h4>Further Information</h4><br/>';
+ // detect appropriate template (currently always default)
+ if($triples['http://www.w3.org/1999/02/22-rdf-syntax-ns#type']) == 'http://dbpedia.org/ontology/City) {
+ $template = new CityTemplate();
+ } else if($triples['http://www.w3.org/1999/02/22-rdf-syntax-ns#type']) == 'http://dbpedia.org/ontology/Person) {
+ $template = new PersonTemplate();
+ } else {
+ $template = new DefaultTemplate();
+ }
+
// filter out uninteresting properties and properties which
// have already been displayed
- filterTriples(&$triples, &$subjecttriples);
+ filterTriples(&$triples, &$subjecttriples);
- $content .= '<br/><hr><h4>Further Information</h4><br/>';
- // detect appropriate template (currently always default)
- $template = new DefaultTemplate();
// display template for this instance (currently the template is similar to the remaining
// instance view apart from beautifications)
$content .= $template->printTemplate($triples,$subjecttriples);
Modified: trunk/src/dbpedia-navigator/templates/AbstractTemplate.php
===================================================================
--- trunk/src/dbpedia-navigator/templates/AbstractTemplate.php 2008-10-28 10:24:19 UTC (rev 1474)
+++ trunk/src/dbpedia-navigator/templates/AbstractTemplate.php 2008-10-28 10:50:04 UTC (rev 1475)
@@ -32,11 +32,15 @@
abstract function printTemplate($triples,$subjecttriples);
+ function getTableHeader() {
+ return '<table border="0" style="width:100%;overflow:hidden"><tr><td><b>Predicate</b></td><td><b>Object/Subject</b></td></tr>';
+ }
+
// function to be called after all "special" actions have been taken;
// it displays all remaining triples
function printRemainingTriples($triples,$subjecttriples) {
+ $table = '';
if ((is_array($triples)&&count($triples)>0)||(is_array($subjecttriples)&&count($subjecttriples)>0)){
- $table = '<table border="0" style="width:100%;overflow:hidden"><tr><td><b>Predicate</b></td><td><b>Object/Subject</b></td></tr>';
$i=1;
if (is_array($triples)&&count($triples)>0) foreach($triples as $predicate=>$object) {
$number=count($object);
@@ -118,7 +122,7 @@
}
$table .= '</table>';
}
- else $table="No Tripel left.";
+ else $table="No triple left.";
return $table;
}
Modified: trunk/src/dbpedia-navigator/templates/CityTemplate.php
===================================================================
--- trunk/src/dbpedia-navigator/templates/CityTemplate.php 2008-10-28 10:24:19 UTC (rev 1474)
+++ trunk/src/dbpedia-navigator/templates/CityTemplate.php 2008-10-28 10:50:04 UTC (rev 1475)
@@ -29,9 +29,8 @@
class CityTemplate extends PopulatedPlaceTemplate {
function printTemplate($triples,$subjecttriples) {
- $content = "";
- $content .= '<table>';
- $content .= '<tr><td colspan="2">City Information</td></tr>';
+ $content = $this-getTableHeader();
+ // $content .= '<tr><td colspan="2">City Information</td></tr>';
// population
$content .= '<tr><td>total population</td><td>' + $this->getPopulationString($triples) + '</td></tr>';
// location
@@ -39,9 +38,9 @@
$content .= '<tr><td>longitude</td><td>' + $this->getLongitudeString($triples) + '</td></tr>';
// resources related to city
// $content .= displayMultipleValues('city');
- $content .= '</table>';
+ // $content .= '</table>';
- // .. continue ...
+ $content .= $this->printRemainingTriples();
return $content;
}
Modified: trunk/src/dbpedia-navigator/templates/DefaultTemplate.php
===================================================================
--- trunk/src/dbpedia-navigator/templates/DefaultTemplate.php 2008-10-28 10:24:19 UTC (rev 1474)
+++ trunk/src/dbpedia-navigator/templates/DefaultTemplate.php 2008-10-28 10:50:04 UTC (rev 1475)
@@ -29,7 +29,8 @@
// simply prints all triples without doing anything special to group/format them
function printTemplate($triples,$subjecttriples) {
- $content = $this->printRemainingTriples($triples,$subjecttriples);
+ $content = $this->getTableHeader();
+ $content .= $this->printRemainingTriples($triples,$subjecttriples);
return $content;
}
Modified: trunk/src/dbpedia-navigator/templates/PersonTemplate.php
===================================================================
--- trunk/src/dbpedia-navigator/templates/PersonTemplate.php 2008-10-28 10:24:19 UTC (rev 1474)
+++ trunk/src/dbpedia-navigator/templates/PersonTemplate.php 2008-10-28 10:50:04 UTC (rev 1475)
@@ -25,8 +25,7 @@
class PersonTemplate extends AbstractTemplate {
function printTemplate($triples,$subjecttriples) {
- $content = "";
-
+ $content = $this->getTableHeader();
$content .= $this->printRemainingTriples($triples,$subjecttriples);
return $content;
}
Modified: trunk/src/dbpedia-navigator/templates/PlaceTemplate.php
===================================================================
--- trunk/src/dbpedia-navigator/templates/PlaceTemplate.php 2008-10-28 10:24:19 UTC (rev 1474)
+++ trunk/src/dbpedia-navigator/templates/PlaceTemplate.php 2008-10-28 10:50:04 UTC (rev 1475)
@@ -36,9 +36,9 @@
return "unknown";
}
- $latitude = $triples['http://dbpedia.org/ontology/latitutedegrees'] + "° "
- + $triples['http://dbpedia.org/ontology/latitudeminutes'] + "′"
- + $triples['http://dbpedia.org/ontology/latitudeseconds'] + "″N";
+ $latitude = $this->extractPropValue('latitutedegrees') + "° "
+ + $this->extractPropValue('latitudeminutes') + "′"
+ + $this->extractPropValue('latitudeseconds') + "″N";
return $latitude;
}
@@ -48,10 +48,10 @@
return "unknown";
}
- $longitude = $triples['http://dbpedia.org/ontology/longitutedegrees'] + "° "
- + $triples['http://dbpedia.org/ontology/longitudeminutes'] + "′"
- + $triples['http://dbpedia.org/ontology/longitudeseconds'] + "″N";
- return $longitude;
+ $longitude = $this->extractPropValue('longitutedegrees') + "° "
+ + $this->extractPropValue('http://dbpedia.org/ontology/longitudeminutes') + "′"
+ + $this->extractPropValue('http://dbpedia.org/ontology/longitudeseconds') + "″N";
+ return $longitude;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sk...@us...> - 2008-10-28 13:36:02
|
Revision: 1476
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1476&view=rev
Author: sknappe
Date: 2008-10-28 12:20:23 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
geonames changes
Modified Paths:
--------------
trunk/src/dbpedia-navigator/DLLearnerConnection.php
Modified: trunk/src/dbpedia-navigator/DLLearnerConnection.php
===================================================================
--- trunk/src/dbpedia-navigator/DLLearnerConnection.php 2008-10-28 10:50:04 UTC (rev 1475)
+++ trunk/src/dbpedia-navigator/DLLearnerConnection.php 2008-10-28 12:20:23 UTC (rev 1476)
@@ -172,10 +172,16 @@
$ret=array();
foreach ($result['results']['bindings'] as $results){
if (!(isset($results['xml:lang'])&&($results['xml:lang']!=$this->lang))){
- if (isset($results['obj'])) $ret[0][$results['pred']['value']][]=$results['obj'];
+ if (isset($results['obj'])){
+ $ret[0][$results['pred']['value']][]=$results['obj'];
+ }
else if (isset($results['sub'])) $ret[1][$results['pred']['value']][]=$results['sub'];
}
}
+ //geonames
+ $query="SELECT ?obj WHERE {?s <http://www.w3.org/2002/07/owl#sameAs> <".$uri.">.?s ?p ?obj}";
+ $result=json_decode($this->client->sparqlQueryPredefinedEndpoint("LOCALGEONAMES", $query),true);
+ var_dump($result);
return $ret;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sk...@us...> - 2008-10-28 13:36:00
|
Revision: 1478
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1478&view=rev
Author: sknappe
Date: 2008-10-28 12:27:13 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
bugfix
Modified Paths:
--------------
trunk/src/dbpedia-navigator/ajax_get_article.php
Modified: trunk/src/dbpedia-navigator/ajax_get_article.php
===================================================================
--- trunk/src/dbpedia-navigator/ajax_get_article.php 2008-10-28 12:21:14 UTC (rev 1477)
+++ trunk/src/dbpedia-navigator/ajax_get_article.php 2008-10-28 12:27:13 UTC (rev 1478)
@@ -262,14 +262,16 @@
$content .= '<br/><hr><h4>Further Information</h4><br/>';
+ $template="";
// detect appropriate template (currently always default)
- if($triples['http://www.w3.org/1999/02/22-rdf-syntax-ns#type']) == 'http://dbpedia.org/ontology/City) {
- $template = new CityTemplate();
- } else if($triples['http://www.w3.org/1999/02/22-rdf-syntax-ns#type']) == 'http://dbpedia.org/ontology/Person) {
- $template = new PersonTemplate();
- } else {
- $template = new DefaultTemplate();
+ foreach ($triples['http://www.w3.org/1999/02/22-rdf-syntax-ns#type'] as $classes){
+ if($class['value'] == 'http://dbpedia.org/ontology/City') {
+ $template = new CityTemplate();
+ } else if($class['value'] == 'http://dbpedia.org/ontology/Person') {
+ $template = new PersonTemplate();
+ }
}
+ if ($template=="") $template = new DefaultTemplate();
// filter out uninteresting properties and properties which
// have already been displayed
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sk...@us...> - 2008-10-28 13:35:51
|
Revision: 1479
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1479&view=rev
Author: sknappe
Date: 2008-10-28 12:37:41 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
bugfix
Modified Paths:
--------------
trunk/src/dbpedia-navigator/DLLearnerConnection.php
trunk/src/dbpedia-navigator/main.wsdl
Modified: trunk/src/dbpedia-navigator/DLLearnerConnection.php
===================================================================
--- trunk/src/dbpedia-navigator/DLLearnerConnection.php 2008-10-28 12:27:13 UTC (rev 1478)
+++ trunk/src/dbpedia-navigator/DLLearnerConnection.php 2008-10-28 12:37:41 UTC (rev 1479)
@@ -180,7 +180,7 @@
}
//geonames
$query="SELECT ?obj WHERE {?s <http://www.w3.org/2002/07/owl#sameAs> <".$uri.">.?s ?p ?obj}";
- $result=json_decode($this->client->sparqlQueryPredefinedEndpoint("LOCALGEONAMES", $query),true);
+ $result=json_decode($this->client->sparqlQueryPredefinedEndpoint("LOCALGEONAMES", $query, true),true);
var_dump($result);
return $ret;
Modified: trunk/src/dbpedia-navigator/main.wsdl
===================================================================
--- trunk/src/dbpedia-navigator/main.wsdl 2008-10-28 12:27:13 UTC (rev 1478)
+++ trunk/src/dbpedia-navigator/main.wsdl 2008-10-28 12:37:41 UTC (rev 1479)
@@ -338,6 +338,14 @@
<message name="sparqlQueryResponse">
<part name="return" type="xsd:string"></part>
</message>
+ <message name="sparqlQueryPredefinedEndpoint">
+ <part name="arg0" type="xsd:string"></part>
+ <part name="arg1" type="xsd:string"></part>
+ <part name="arg2" type="xsd:boolean"></part>
+ </message>
+ <message name="sparqlQueryPredefinedEndpointResponse">
+ <part name="return" type="xsd:string"></part>
+ </message>
<message name="isSparqlQueryRunning">
<part name="arg0" type="xsd:int"></part>
<part name="arg1" type="xsd:int"></part>
@@ -658,6 +666,10 @@
<output message="tns:sparqlQueryResponse"></output>
<fault message="tns:ClientNotKnownException" name="ClientNotKnownException"></fault>
</operation>
+ <operation name="sparqlQueryPredefinedEndpoint" parameterOrder="arg0 arg1 arg2">
+ <input message="tns:sparqlQueryPredefinedEndpoint"></input>
+ <output message="tns:sparqlQueryPredefinedEndpointResponse"></output>
+ </operation>
<operation name="isSparqlQueryRunning" parameterOrder="arg0 arg1">
<input message="tns:isSparqlQueryRunning"></input>
<output message="tns:isSparqlQueryRunningResponse"></output>
@@ -1351,6 +1363,15 @@
<soap:fault name="ClientNotKnownException" use="literal"></soap:fault>
</fault>
</operation>
+ <operation name="sparqlQueryPredefinedEndpoint">
+ <soap:operation soapAction=""></soap:operation>
+ <input>
+ <soap:body use="literal" namespace="http://server.dllearner.org/"></soap:body>
+ </input>
+ <output>
+ <soap:body use="literal" namespace="http://server.dllearner.org/"></soap:body>
+ </output>
+ </operation>
<operation name="isSparqlQueryRunning">
<soap:operation soapAction=""></soap:operation>
<input>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sk...@us...> - 2008-10-28 13:35:44
|
Revision: 1480
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1480&view=rev
Author: sknappe
Date: 2008-10-28 12:37:55 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
bugfix
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
Modified: trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java 2008-10-28 12:37:41 UTC (rev 1479)
+++ trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java 2008-10-28 12:37:55 UTC (rev 1480)
@@ -681,6 +681,7 @@
* @return The result of the SPARQL query in JSON format or null if the endpoint does not exist.
* @see SPARQLEndpoint#getEndpointByName;
*/
+ @WebMethod
public String sparqlQueryPredefinedEndpoint(String predefinedEndpoint, String query, boolean useCache) {
SparqlEndpoint endpoint = SparqlEndpoint.getEndpointByName(predefinedEndpoint);
SPARQLTasks st;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sk...@us...> - 2008-10-28 13:35:30
|
Revision: 1481
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1481&view=rev
Author: sknappe
Date: 2008-10-28 12:50:37 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
bugfix
Modified Paths:
--------------
trunk/src/dbpedia-navigator/DLLearnerConnection.php
Modified: trunk/src/dbpedia-navigator/DLLearnerConnection.php
===================================================================
--- trunk/src/dbpedia-navigator/DLLearnerConnection.php 2008-10-28 12:37:55 UTC (rev 1480)
+++ trunk/src/dbpedia-navigator/DLLearnerConnection.php 2008-10-28 12:50:37 UTC (rev 1481)
@@ -170,18 +170,23 @@
$result=json_decode($this->getSparqlResultThreaded($query),true);
if (count($result['results']['bindings'])==0) throw new Exception("An article with that name does not exist. The Search is started ...");
$ret=array();
+ $geonames="";
foreach ($result['results']['bindings'] as $results){
if (!(isset($results['xml:lang'])&&($results['xml:lang']!=$this->lang))){
if (isset($results['obj'])){
$ret[0][$results['pred']['value']][]=$results['obj'];
+ if ($results['pred']['value']=="http://www.w3.org/2002/07/owl#sameAs"&&strlen($results['obj']['value'])>24&&substr($results['obj']['value'],0,24)=='http://sws.geonames.org/')
+ $geonames=$results['obj']['value'];
}
else if (isset($results['sub'])) $ret[1][$results['pred']['value']][]=$results['sub'];
}
}
//geonames
- $query="SELECT ?obj WHERE {?s <http://www.w3.org/2002/07/owl#sameAs> <".$uri.">.?s ?p ?obj}";
- $result=json_decode($this->client->sparqlQueryPredefinedEndpoint("LOCALGEONAMES", $query, true),true);
- var_dump($result);
+ if (strlen($geonames)>0){
+ $query="SELECT ?obj WHERE {<".$geonames."> ?p ?obj}";
+ $result=json_decode($this->client->sparqlQueryPredefinedEndpoint("LOCALGEONAMES", $query, true),true);
+ var_dump($result);
+ }
return $ret;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sk...@us...> - 2008-10-28 13:35:26
|
Revision: 1482
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1482&view=rev
Author: sknappe
Date: 2008-10-28 12:54:36 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
bugfix
Modified Paths:
--------------
trunk/src/dbpedia-navigator/DLLearnerConnection.php
Modified: trunk/src/dbpedia-navigator/DLLearnerConnection.php
===================================================================
--- trunk/src/dbpedia-navigator/DLLearnerConnection.php 2008-10-28 12:50:37 UTC (rev 1481)
+++ trunk/src/dbpedia-navigator/DLLearnerConnection.php 2008-10-28 12:54:36 UTC (rev 1482)
@@ -183,7 +183,7 @@
}
//geonames
if (strlen($geonames)>0){
- $query="SELECT ?obj WHERE {<".$geonames."> ?p ?obj}";
+ $query="SELECT * WHERE {<".$geonames."> <http://www.geonames.org/ontology#parent> ?parent.<".$geonames."> <http://www.geonames.org/ontology#children> ?children.<".$geonames."> <http://www.geonames.org/ontology#neighbours> ?neighbours.}";
$result=json_decode($this->client->sparqlQueryPredefinedEndpoint("LOCALGEONAMES", $query, true),true);
var_dump($result);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Jen...@us...> - 2008-10-28 13:24:44
|
Revision: 1477
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1477&view=rev
Author: JensLehmann
Date: 2008-10-28 12:21:14 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
caching for querying predefined endpoints
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
Modified: trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java 2008-10-28 12:20:23 UTC (rev 1476)
+++ trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java 2008-10-28 12:21:14 UTC (rev 1477)
@@ -677,12 +677,18 @@
* Queries one of the standard endpoints defined in DL-Learner.
* @param predefinedEndpoint A string describing the endpoint e.g. DBpedia.
* @param query The SPARQL query.
+ * @param useCache Specify whether to use a cache for queries.
* @return The result of the SPARQL query in JSON format or null if the endpoint does not exist.
* @see SPARQLEndpoint#getEndpointByName;
*/
- public String sparqlQueryPredefinedEndpoint(String predefinedEndpoint, String query) {
+ public String sparqlQueryPredefinedEndpoint(String predefinedEndpoint, String query, boolean useCache) {
SparqlEndpoint endpoint = SparqlEndpoint.getEndpointByName(predefinedEndpoint);
- SPARQLTasks st = new SPARQLTasks(endpoint);
+ SPARQLTasks st;
+ if(useCache) {
+ st = new SPARQLTasks(endpoint);
+ } else {
+ st = new SPARQLTasks(Cache.getDefaultCache(), endpoint);
+ }
return st.query(query);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sk...@us...> - 2008-10-28 13:24:44
|
Revision: 1483
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1483&view=rev
Author: sknappe
Date: 2008-10-28 13:23:50 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
bugfix
Modified Paths:
--------------
trunk/src/dbpedia-navigator/DLLearnerConnection.php
trunk/src/dbpedia-navigator/ajax_get_article.php
Modified: trunk/src/dbpedia-navigator/DLLearnerConnection.php
===================================================================
--- trunk/src/dbpedia-navigator/DLLearnerConnection.php 2008-10-28 12:54:36 UTC (rev 1482)
+++ trunk/src/dbpedia-navigator/DLLearnerConnection.php 2008-10-28 13:23:50 UTC (rev 1483)
@@ -182,11 +182,11 @@
}
}
//geonames
- if (strlen($geonames)>0){
- $query="SELECT * WHERE {<".$geonames."> <http://www.geonames.org/ontology#parent> ?parent.<".$geonames."> <http://www.geonames.org/ontology#children> ?children.<".$geonames."> <http://www.geonames.org/ontology#neighbours> ?neighbours.}";
+ /*if (strlen($geonames)>0){
+ $query="SELECT * WHERE {<".$geonames."> <http://www.geonames.org/ontology#parentFeature> ?parent.<".$geonames."> <http://www.geonames.org/ontology#children> ?children.<".$geonames."> <http://www.geonames.org/ontology#nearbyFeatures> ?neighbours.}";
$result=json_decode($this->client->sparqlQueryPredefinedEndpoint("LOCALGEONAMES", $query, true),true);
var_dump($result);
- }
+ }*/
return $ret;
}
Modified: trunk/src/dbpedia-navigator/ajax_get_article.php
===================================================================
--- trunk/src/dbpedia-navigator/ajax_get_article.php 2008-10-28 12:54:36 UTC (rev 1482)
+++ trunk/src/dbpedia-navigator/ajax_get_article.php 2008-10-28 13:23:50 UTC (rev 1483)
@@ -264,7 +264,7 @@
$template="";
// detect appropriate template (currently always default)
- foreach ($triples['http://www.w3.org/1999/02/22-rdf-syntax-ns#type'] as $classes){
+ if (isset($triples['http://www.w3.org/1999/02/22-rdf-syntax-ns#type'])) foreach ($triples['http://www.w3.org/1999/02/22-rdf-syntax-ns#type'] as $classes){
if($class['value'] == 'http://dbpedia.org/ontology/City') {
$template = new CityTemplate();
} else if($class['value'] == 'http://dbpedia.org/ontology/Person') {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Jen...@us...> - 2008-10-28 12:03:19
|
Revision: 1472
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1472&view=rev
Author: JensLehmann
Date: 2008-10-28 10:19:29 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
added web service method to query a predefined endpoint
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/kb/sparql/NaturalLanguageDescriptionConvertVisitor.java
trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlEndpoint.java
trunk/src/dl-learner/org/dllearner/scripts/CalculatePageRank.java
trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/NaturalLanguageDescriptionConvertVisitor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/NaturalLanguageDescriptionConvertVisitor.java 2008-10-28 10:15:47 UTC (rev 1471)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/NaturalLanguageDescriptionConvertVisitor.java 2008-10-28 10:19:29 UTC (rev 1472)
@@ -1,7 +1,6 @@
package org.dllearner.kb.sparql;
import java.util.Iterator;
import java.util.Set;
-import java.util.SortedSet;
import org.apache.log4j.Logger;
import org.dllearner.algorithms.gp.ADC;
@@ -134,7 +133,7 @@
System.out.println("Finished");*/
//String conj="EXISTS \"http://xmlns.com/foaf/0.1/page\".<= 0 \"http://www.w3.org/2004/02/skos/core#subject\".TOP";
//String conj="(\"Male\" AND (\"hasDog\" = 18))";
- ObjectValueRestriction rest=new ObjectValueRestriction(new ObjectProperty("hasAge"),new Individual("18"));
+// ObjectValueRestriction rest=new ObjectValueRestriction(new ObjectProperty("hasAge"),new Individual("18"));
//System.out.println(NaturalLanguageDescriptionConvertVisitor.getNaturalLanguageDescription(rest));
} catch (/*Parse*/Exception e) {
// TODO Auto-generated catch block
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlEndpoint.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlEndpoint.java 2008-10-28 10:15:47 UTC (rev 1471)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlEndpoint.java 2008-10-28 10:19:29 UTC (rev 1472)
@@ -83,6 +83,8 @@
return getEndpointDBpedia();
} else if (name.equals("LOCALDBPEDIA")) {
return getEndpointLOCALDBpedia();
+ } else if (name.equals("LOCALGEONAMES")) {
+ return getEndpointLOCALGeonames();
} else if (name.equals("LOCALJOSECKI") || name.equals("LOCALJOSEKI") ) {
return getEndpointlocalJoseki();
} else if (name.equals("LOCALJOSEKIBIBLE")||name.equals("LOCALJOSECKIBIBLE")) {
@@ -157,6 +159,18 @@
return new SparqlEndpoint(u, defaultGraphURIs, new LinkedList<String>());
}
+ public static SparqlEndpoint getEndpointLOCALGeonames() {
+ URL u = null;
+ try {
+ u = new URL("http://139.18.2.37:8890/sparql");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ LinkedList<String> defaultGraphURIs=new LinkedList<String>();
+ defaultGraphURIs.add("http://geonames.org");
+ return new SparqlEndpoint(u, defaultGraphURIs, new LinkedList<String>());
+ }
+
public static SparqlEndpoint getEndpointlocalJoseki() {
URL u = null;
try {
Modified: trunk/src/dl-learner/org/dllearner/scripts/CalculatePageRank.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/CalculatePageRank.java 2008-10-28 10:15:47 UTC (rev 1471)
+++ trunk/src/dl-learner/org/dllearner/scripts/CalculatePageRank.java 2008-10-28 10:19:29 UTC (rev 1472)
@@ -44,6 +44,7 @@
* @author Jens Lehmann
*
*/
+@SuppressWarnings("unused")
public class CalculatePageRank {
private static String datasetDir;
Modified: trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java 2008-10-28 10:15:47 UTC (rev 1471)
+++ trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java 2008-10-28 10:19:29 UTC (rev 1472)
@@ -64,6 +64,7 @@
import org.dllearner.kb.sparql.Cache;
import org.dllearner.kb.sparql.NaturalLanguageDescriptionConvertVisitor;
import org.dllearner.kb.sparql.SPARQLTasks;
+import org.dllearner.kb.sparql.SparqlEndpoint;
import org.dllearner.kb.sparql.SparqlKnowledgeSource;
import org.dllearner.kb.sparql.SparqlQueryDescriptionConvertVisitor;
import org.dllearner.kb.sparql.SparqlQueryException;
@@ -672,6 +673,19 @@
else return sparql.getJson();*/
}
+ /**
+ * Queries one of the standard endpoints defined in DL-Learner.
+ * @param predefinedEndpoint A string describing the endpoint e.g. DBpedia.
+ * @param query The SPARQL query.
+ * @return The result of the SPARQL query in JSON format or null if the endpoint does not exist.
+ * @see SPARQLEndpoint#getEndpointByName;
+ */
+ public String sparqlQueryPredefinedEndpoint(String predefinedEndpoint, String query) {
+ SparqlEndpoint endpoint = SparqlEndpoint.getEndpointByName(predefinedEndpoint);
+ SPARQLTasks st = new SPARQLTasks(endpoint);
+ return st.query(query);
+ }
+
@WebMethod
public boolean isSparqlQueryRunning(int sessionID, int queryID) throws ClientNotKnownException
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sk...@us...> - 2008-10-28 10:23:29
|
Revision: 1473
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1473&view=rev
Author: sknappe
Date: 2008-10-28 10:22:25 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
bugfix
Modified Paths:
--------------
trunk/src/dbpedia-navigator/ajax_get_subjects_from_concept.php
Modified: trunk/src/dbpedia-navigator/ajax_get_subjects_from_concept.php
===================================================================
--- trunk/src/dbpedia-navigator/ajax_get_subjects_from_concept.php 2008-10-28 10:19:29 UTC (rev 1472)
+++ trunk/src/dbpedia-navigator/ajax_get_subjects_from_concept.php 2008-10-28 10:22:25 UTC (rev 1473)
@@ -64,7 +64,7 @@
for ($j=1;$j<$i-1;$j++)
$temp.='cat'.$j.'.name=cat'.($j+1).'.name AND ';
- $query=$temp.'('.$final.') LIMIT '.$number;
+ $query=$temp.'('.$final.') ORDER BY number LIMIT '.$number;
$res=$databaseConnection->query($query);
$bestsearches="";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sk...@us...> - 2008-10-28 10:18:27
|
Revision: 1471
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1471&view=rev
Author: sknappe
Date: 2008-10-28 10:15:47 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
bugfix
Modified Paths:
--------------
trunk/src/dbpedia-navigator/DLLearnerConnection.php
Modified: trunk/src/dbpedia-navigator/DLLearnerConnection.php
===================================================================
--- trunk/src/dbpedia-navigator/DLLearnerConnection.php 2008-10-28 10:12:48 UTC (rev 1470)
+++ trunk/src/dbpedia-navigator/DLLearnerConnection.php 2008-10-28 10:15:47 UTC (rev 1471)
@@ -62,11 +62,11 @@
$this->client->applyConfigEntryString($this->id, $this->ksID, "predefinedManipulator", "DBPEDIA-NAVIGATOR");
$this->client->applyConfigEntryBoolean($this->id, $this->ksID, "useCache", true);
if(empty($negExamples)){
- /*if ($settings->classSystem=="YAGO") $filterClasses=array("http://xmlns.com/foaf/","http://dbpedia.org/ontology/");
+ if ($settings->classSystem=="YAGO") $filterClasses=array("http://xmlns.com/foaf/","http://dbpedia.org/ontology/");
else if ($settings->classSystem=="DBpedia") $filterClasses=array("http://xmlns.com/foaf/","http://dbpedia.org/class/yago/","http://dbpedia.org/ontology/Resource");
$negExamples=$this->client->getNegativeExamples($this->id,$this->ksID,$posExamples,count($posExamples),"http://dbpedia.org/resource/",$filterClasses);
- $negExamples=$negExamples->item;*/
- $negExamples=getNegativeExamplesFromParallelClass($posExamples);
+ $negExamples=$negExamples->item;
+ //$negExamples=getNegativeExamplesFromParallelClass($posExamples);
}
$this->client->applyConfigEntryStringArray($this->id, $this->ksID, "instances", array_merge($posExamples,$negExamples));
$this->client->setReasoner($this->id, "fastInstanceChecker");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sk...@us...> - 2008-10-28 10:17:14
|
Revision: 1470
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1470&view=rev
Author: sknappe
Date: 2008-10-28 10:12:48 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
bugfix
Modified Paths:
--------------
trunk/src/dbpedia-navigator/helper_functions.php
Modified: trunk/src/dbpedia-navigator/helper_functions.php
===================================================================
--- trunk/src/dbpedia-navigator/helper_functions.php 2008-10-28 10:10:34 UTC (rev 1469)
+++ trunk/src/dbpedia-navigator/helper_functions.php 2008-10-28 10:12:48 UTC (rev 1470)
@@ -617,7 +617,7 @@
if (isset($triples['http://dbpedia.org/property/spokenWikipedia2Property'])) unset($triples['http://dbpedia.org/property/spokenWikipedia2Property']);
}
-public function getNegativeExamplesFromParallelClass($posExamples){
+function getNegativeExamplesFromParallelClass($posExamples){
include_once('Settings.php');
include_once('DatabaseConnection.php');
//connect to the database
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sk...@us...> - 2008-10-28 09:27:25
|
Revision: 1466
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1466&view=rev
Author: sknappe
Date: 2008-10-28 09:02:10 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
bugfix
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
Modified: trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java 2008-10-28 08:57:49 UTC (rev 1465)
+++ trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java 2008-10-28 09:02:10 UTC (rev 1466)
@@ -731,7 +731,6 @@
@WebMethod
public String[] getNegativeExamples(int sessionID, int componentID,String[] positives, int results, String namespace, String[] filterClasses) throws ClientNotKnownException
{
- System.out.println(filterClasses.length);
int sparqlResultSetLimit = 500;
SortedSet<String> positiveSet = new TreeSet<String>(Arrays.asList(positives));
SortedSet<String> filterSet = new TreeSet<String>(Arrays.asList(filterClasses));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sk...@us...> - 2008-10-28 09:21:18
|
Revision: 1468
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1468&view=rev
Author: sknappe
Date: 2008-10-28 09:18:33 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
bugfix
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL.java
Modified: trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL.java 2008-10-28 09:18:18 UTC (rev 1467)
+++ trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL.java 2008-10-28 09:18:33 UTC (rev 1468)
@@ -174,7 +174,10 @@
for (String oneClass : classes){
Iterator<String> iter=filterClasses.iterator();
while (iter.hasNext()){
- if (!oneClass.startsWith(iter.next())){
+ if (oneClass.startsWith(iter.next())){
+ break;
+ }
+ else{
concept=oneClass;
br=true;
break;
@@ -192,8 +195,10 @@
}
classes.remove(concept);
for (String oneClass : classes) {
- fromNearbyClasses.addAll(sparqltasks.retrieveInstancesForClassDescription("\""
- + oneClass + "\"", sparqlResultLimit));
+ try{
+ fromNearbyClasses.addAll(sparqltasks.retrieveInstancesForClassDescription("\""
+ + oneClass + "\"", sparqlResultLimit));
+ } catch (Exception e){}
}
this.fromNearbyClasses.removeAll(fullPositiveSet);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sk...@us...> - 2008-10-28 09:21:03
|
Revision: 1467
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1467&view=rev
Author: sknappe
Date: 2008-10-28 09:18:18 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
bugfix
Modified Paths:
--------------
trunk/src/dbpedia-navigator/DLLearnerConnection.php
Modified: trunk/src/dbpedia-navigator/DLLearnerConnection.php
===================================================================
--- trunk/src/dbpedia-navigator/DLLearnerConnection.php 2008-10-28 09:02:10 UTC (rev 1466)
+++ trunk/src/dbpedia-navigator/DLLearnerConnection.php 2008-10-28 09:18:18 UTC (rev 1467)
@@ -62,7 +62,7 @@
$this->client->applyConfigEntryBoolean($this->id, $this->ksID, "useCache", true);
if(empty($negExamples)){
if ($settings->classSystem=="YAGO") $filterClasses=array("http://xmlns.com/foaf/","http://dbpedia.org/ontology/");
- else if ($settings->classSystem=="DBpedia") $filterClasses=array("http://xmlns.com/foaf/","http://dbpedia.org/class/yago/");
+ else if ($settings->classSystem=="DBpedia") $filterClasses=array("http://xmlns.com/foaf/","http://dbpedia.org/class/yago/","http://dbpedia.org/ontology/Resource");
$negExamples=$this->client->getNegativeExamples($this->id,$this->ksID,$posExamples,count($posExamples),"http://dbpedia.org/resource/",$filterClasses);
$negExamples=$negExamples->item;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sk...@us...> - 2008-10-28 09:02:14
|
Revision: 1465
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1465&view=rev
Author: sknappe
Date: 2008-10-28 08:57:49 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
bugfix
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
Modified: trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java 2008-10-28 08:54:18 UTC (rev 1464)
+++ trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java 2008-10-28 08:57:49 UTC (rev 1465)
@@ -731,6 +731,7 @@
@WebMethod
public String[] getNegativeExamples(int sessionID, int componentID,String[] positives, int results, String namespace, String[] filterClasses) throws ClientNotKnownException
{
+ System.out.println(filterClasses.length);
int sparqlResultSetLimit = 500;
SortedSet<String> positiveSet = new TreeSet<String>(Arrays.asList(positives));
SortedSet<String> filterSet = new TreeSet<String>(Arrays.asList(filterClasses));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sk...@us...> - 2008-10-28 08:58:25
|
Revision: 1463
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1463&view=rev
Author: sknappe
Date: 2008-10-28 08:53:58 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
changes to use new ontology
Modified Paths:
--------------
trunk/src/dbpedia-navigator/DLLearnerConnection.php
trunk/src/dbpedia-navigator/main.wsdl
Modified: trunk/src/dbpedia-navigator/DLLearnerConnection.php
===================================================================
--- trunk/src/dbpedia-navigator/DLLearnerConnection.php 2008-10-28 07:16:14 UTC (rev 1462)
+++ trunk/src/dbpedia-navigator/DLLearnerConnection.php 2008-10-28 08:53:58 UTC (rev 1463)
@@ -61,7 +61,9 @@
$this->client->applyConfigEntryString($this->id, $this->ksID, "predefinedManipulator", "DBPEDIA-NAVIGATOR");
$this->client->applyConfigEntryBoolean($this->id, $this->ksID, "useCache", true);
if(empty($negExamples)){
- $negExamples=$this->client->getNegativeExamples($this->id,$this->ksID,$posExamples,count($posExamples),"http://dbpedia.org/resource/");
+ if ($settings->classSystem=="YAGO") $filterClasses=array("http://xmlns.com/foaf/","http://dbpedia.org/ontology/");
+ else if ($settings->classSystem=="DBpedia") $filterClasses=array("http://xmlns.com/foaf/","http://dbpedia.org/class/yago/");
+ $negExamples=$this->client->getNegativeExamples($this->id,$this->ksID,$posExamples,count($posExamples),"http://dbpedia.org/resource/",$filterClasses);
$negExamples=$negExamples->item;
}
$this->client->applyConfigEntryStringArray($this->id, $this->ksID, "instances", array_merge($posExamples,$negExamples));
Modified: trunk/src/dbpedia-navigator/main.wsdl
===================================================================
--- trunk/src/dbpedia-navigator/main.wsdl 2008-10-28 07:16:14 UTC (rev 1462)
+++ trunk/src/dbpedia-navigator/main.wsdl 2008-10-28 08:53:58 UTC (rev 1463)
@@ -7,6 +7,28 @@
<xsd:import schemaLocation="def1.xsd" namespace="http://jaxb.dev.java.net/array"></xsd:import>
</xsd:schema>
</types>
+ <message name="init">
+ <part name="arg0" type="xsd:int"></part>
+ <part name="arg1" type="xsd:int"></part>
+ </message>
+ <message name="initResponse"></message>
+ <message name="ClientNotKnownException">
+ <part element="tns:ClientNotKnownException" name="fault"></part>
+ </message>
+ <message name="UnknownComponentException">
+ <part element="tns:UnknownComponentException" name="fault"></part>
+ </message>
+ <message name="ComponentInitException">
+ <part element="tns:ComponentInitException" name="fault"></part>
+ </message>
+ <message name="debug">
+ <part name="arg0" type="xsd:string"></part>
+ </message>
+ <message name="debugResponse"></message>
+ <message name="stop">
+ <part name="arg0" type="xsd:int"></part>
+ </message>
+ <message name="stopResponse"></message>
<message name="getBuild"></message>
<message name="getBuildResponse">
<part name="return" type="xsd:string"></part>
@@ -15,32 +37,33 @@
<message name="generateIDResponse">
<part name="return" type="xsd:int"></part>
</message>
+ <message name="getComponents"></message>
+ <message name="getComponentsResponse">
+ <part xmlns:ns1="http://jaxb.dev.java.net/array" name="return" type="ns1:stringArray"></part>
+ </message>
<message name="getKnowledgeSources"></message>
<message name="getKnowledgeSourcesResponse">
- <part xmlns:ns1="http://jaxb.dev.java.net/array" name="return" type="ns1:stringArray"></part>
+ <part xmlns:ns2="http://jaxb.dev.java.net/array" name="return" type="ns2:stringArray"></part>
</message>
<message name="getReasoners"></message>
<message name="getReasonersResponse">
- <part xmlns:ns2="http://jaxb.dev.java.net/array" name="return" type="ns2:stringArray"></part>
+ <part xmlns:ns3="http://jaxb.dev.java.net/array" name="return" type="ns3:stringArray"></part>
</message>
<message name="getLearningProblems"></message>
<message name="getLearningProblemsResponse">
- <part xmlns:ns3="http://jaxb.dev.java.net/array" name="return" type="ns3:stringArray"></part>
+ <part xmlns:ns4="http://jaxb.dev.java.net/array" name="return" type="ns4:stringArray"></part>
</message>
<message name="getLearningAlgorithms"></message>
<message name="getLearningAlgorithmsResponse">
- <part xmlns:ns4="http://jaxb.dev.java.net/array" name="return" type="ns4:stringArray"></part>
+ <part xmlns:ns5="http://jaxb.dev.java.net/array" name="return" type="ns5:stringArray"></part>
</message>
<message name="getConfigOptions">
<part name="arg0" type="xsd:string"></part>
<part name="arg1" type="xsd:boolean"></part>
</message>
<message name="getConfigOptionsResponse">
- <part xmlns:ns5="http://jaxb.dev.java.net/array" name="return" type="ns5:stringArray"></part>
+ <part xmlns:ns6="http://jaxb.dev.java.net/array" name="return" type="ns6:stringArray"></part>
</message>
- <message name="UnknownComponentException">
- <part element="tns:UnknownComponentException" name="fault"></part>
- </message>
<message name="addKnowledgeSource">
<part name="arg0" type="xsd:int"></part>
<part name="arg1" type="xsd:string"></part>
@@ -49,9 +72,6 @@
<message name="addKnowledgeSourceResponse">
<part name="return" type="xsd:int"></part>
</message>
- <message name="ClientNotKnownException">
- <part element="tns:ClientNotKnownException" name="fault"></part>
- </message>
<message name="MalformedURLException">
<part element="tns:MalformedURLException" name="fault"></part>
</message>
@@ -88,9 +108,6 @@
<part name="arg0" type="xsd:int"></part>
</message>
<message name="initAllResponse"></message>
- <message name="ComponentInitException">
- <part element="tns:ComponentInitException" name="fault"></part>
- </message>
<message name="learn">
<part name="arg0" type="xsd:int"></part>
<part name="arg1" type="xsd:string"></part>
@@ -128,7 +145,7 @@
<part name="arg2" type="xsd:string"></part>
</message>
<message name="getCurrentlyBestConceptsResponse">
- <part xmlns:ns6="http://jaxb.dev.java.net/array" name="return" type="ns6:stringArray"></part>
+ <part xmlns:ns7="http://jaxb.dev.java.net/array" name="return" type="ns7:stringArray"></part>
</message>
<message name="getCurrentlyBestEvaluatedDescriptionsFiltered">
<part name="arg0" type="xsd:int"></part>
@@ -147,12 +164,12 @@
</message>
<message name="setPositiveExamples">
<part name="arg0" type="xsd:int"></part>
- <part xmlns:ns7="http://jaxb.dev.java.net/array" name="arg1" type="ns7:stringArray"></part>
+ <part xmlns:ns8="http://jaxb.dev.java.net/array" name="arg1" type="ns8:stringArray"></part>
</message>
<message name="setPositiveExamplesResponse"></message>
<message name="setNegativeExamples">
<part name="arg0" type="xsd:int"></part>
- <part xmlns:ns8="http://jaxb.dev.java.net/array" name="arg1" type="ns8:stringArray"></part>
+ <part xmlns:ns9="http://jaxb.dev.java.net/array" name="arg1" type="ns9:stringArray"></part>
</message>
<message name="setNegativeExamplesResponse"></message>
<message name="applyConfigEntryInt">
@@ -180,7 +197,7 @@
<part name="arg0" type="xsd:int"></part>
<part name="arg1" type="xsd:int"></part>
<part name="arg2" type="xsd:string"></part>
- <part xmlns:ns9="http://jaxb.dev.java.net/array" name="arg3" type="ns9:stringArray"></part>
+ <part xmlns:ns10="http://jaxb.dev.java.net/array" name="arg3" type="ns10:stringArray"></part>
</message>
<message name="applyConfigEntryStringArrayResponse"></message>
<message name="applyConfigEntryBoolean">
@@ -196,7 +213,7 @@
<part name="arg2" type="xsd:string"></part>
</message>
<message name="getConfigOptionValueStringArrayResponse">
- <part xmlns:ns10="http://jaxb.dev.java.net/array" name="return" type="ns10:stringArray"></part>
+ <part xmlns:ns11="http://jaxb.dev.java.net/array" name="return" type="ns11:stringArray"></part>
</message>
<message name="ConfigOptionTypeException">
<part element="tns:ConfigOptionTypeException" name="fault"></part>
@@ -245,7 +262,7 @@
<part name="arg0" type="xsd:int"></part>
</message>
<message name="getAtomicConceptsResponse">
- <part xmlns:ns11="http://jaxb.dev.java.net/array" name="return" type="ns11:stringArray"></part>
+ <part xmlns:ns12="http://jaxb.dev.java.net/array" name="return" type="ns12:stringArray"></part>
</message>
<message name="getSubsumptionHierarchy">
<part name="arg0" type="xsd:int"></part>
@@ -258,7 +275,7 @@
<part name="arg1" type="xsd:string"></part>
</message>
<message name="retrievalResponse">
- <part xmlns:ns12="http://jaxb.dev.java.net/array" name="return" type="ns12:stringArray"></part>
+ <part xmlns:ns13="http://jaxb.dev.java.net/array" name="return" type="ns13:stringArray"></part>
</message>
<message name="ParseException">
<part element="tns:ParseException" name="fault"></part>
@@ -273,20 +290,20 @@
<part name="arg0" type="xsd:int"></part>
</message>
<message name="getAtomicRolesResponse">
- <part xmlns:ns13="http://jaxb.dev.java.net/array" name="return" type="ns13:stringArray"></part>
+ <part xmlns:ns14="http://jaxb.dev.java.net/array" name="return" type="ns14:stringArray"></part>
</message>
<message name="getInstances">
<part name="arg0" type="xsd:int"></part>
</message>
<message name="getInstancesResponse">
- <part xmlns:ns14="http://jaxb.dev.java.net/array" name="return" type="ns14:stringArray"></part>
+ <part xmlns:ns15="http://jaxb.dev.java.net/array" name="return" type="ns15:stringArray"></part>
</message>
<message name="getIndividualsForARole">
<part name="arg0" type="xsd:int"></part>
<part name="arg1" type="xsd:string"></part>
</message>
<message name="getIndividualsForARoleResponse">
- <part xmlns:ns15="http://jaxb.dev.java.net/array" name="return" type="ns15:stringArray"></part>
+ <part xmlns:ns16="http://jaxb.dev.java.net/array" name="return" type="ns16:stringArray"></part>
</message>
<message name="getAsJSON">
<part name="arg0" type="xsd:int"></part>
@@ -338,14 +355,14 @@
<part name="arg1" type="xsd:int"></part>
</message>
<message name="getConceptDepthResponse">
- <part xmlns:ns16="http://jaxb.dev.java.net/array" name="return" type="ns16:intArray"></part>
+ <part xmlns:ns17="http://jaxb.dev.java.net/array" name="return" type="ns17:intArray"></part>
</message>
<message name="getConceptArity">
<part name="arg0" type="xsd:int"></part>
<part name="arg1" type="xsd:int"></part>
</message>
<message name="getConceptArityResponse">
- <part xmlns:ns17="http://jaxb.dev.java.net/array" name="return" type="ns17:intArray"></part>
+ <part xmlns:ns18="http://jaxb.dev.java.net/array" name="return" type="ns18:intArray"></part>
</message>
<message name="SparqlRetrieval">
<part name="arg0" type="xsd:string"></part>
@@ -365,31 +382,31 @@
<message name="getNegativeExamples">
<part name="arg0" type="xsd:int"></part>
<part name="arg1" type="xsd:int"></part>
- <part xmlns:ns18="http://jaxb.dev.java.net/array" name="arg2" type="ns18:stringArray"></part>
+ <part xmlns:ns19="http://jaxb.dev.java.net/array" name="arg2" type="ns19:stringArray"></part>
<part name="arg3" type="xsd:int"></part>
<part name="arg4" type="xsd:string"></part>
+ <part xmlns:ns20="http://jaxb.dev.java.net/array" name="arg5" type="ns20:stringArray"></part>
</message>
<message name="getNegativeExamplesResponse">
- <part xmlns:ns19="http://jaxb.dev.java.net/array" name="return" type="ns19:stringArray"></part>
+ <part xmlns:ns21="http://jaxb.dev.java.net/array" name="return" type="ns21:stringArray"></part>
</message>
- <message name="init">
- <part name="arg0" type="xsd:int"></part>
- <part name="arg1" type="xsd:int"></part>
- </message>
- <message name="initResponse"></message>
- <message name="debug">
- <part name="arg0" type="xsd:string"></part>
- </message>
- <message name="debugResponse"></message>
- <message name="stop">
- <part name="arg0" type="xsd:int"></part>
- </message>
- <message name="stopResponse"></message>
- <message name="getComponents"></message>
- <message name="getComponentsResponse">
- <part xmlns:ns20="http://jaxb.dev.java.net/array" name="return" type="ns20:stringArray"></part>
- </message>
<portType name="DLLearnerWebService">
+ <operation name="init" parameterOrder="arg0 arg1">
+ <input message="tns:init"></input>
+ <output message="tns:initResponse"></output>
+ <fault message="tns:ClientNotKnownException" name="ClientNotKnownException"></fault>
+ <fault message="tns:UnknownComponentException" name="UnknownComponentException"></fault>
+ <fault message="tns:ComponentInitException" name="ComponentInitException"></fault>
+ </operation>
+ <operation name="debug" parameterOrder="arg0">
+ <input message="tns:debug"></input>
+ <output message="tns:debugResponse"></output>
+ </operation>
+ <operation name="stop" parameterOrder="arg0">
+ <input message="tns:stop"></input>
+ <output message="tns:stopResponse"></output>
+ <fault message="tns:ClientNotKnownException" name="ClientNotKnownException"></fault>
+ </operation>
<operation name="getBuild" parameterOrder="">
<input message="tns:getBuild"></input>
<output message="tns:getBuildResponse"></output>
@@ -398,6 +415,10 @@
<input message="tns:generateID"></input>
<output message="tns:generateIDResponse"></output>
</operation>
+ <operation name="getComponents" parameterOrder="">
+ <input message="tns:getComponents"></input>
+ <output message="tns:getComponentsResponse"></output>
+ </operation>
<operation name="getKnowledgeSources" parameterOrder="">
<input message="tns:getKnowledgeSources"></input>
<output message="tns:getKnowledgeSourcesResponse"></output>
@@ -668,34 +689,53 @@
<fault message="tns:ParseException" name="ParseException"></fault>
<fault message="tns:ClientNotKnownException" name="ClientNotKnownException"></fault>
</operation>
- <operation name="getNegativeExamples" parameterOrder="arg0 arg1 arg2 arg3 arg4">
+ <operation name="getNegativeExamples" parameterOrder="arg0 arg1 arg2 arg3 arg4 arg5">
<input message="tns:getNegativeExamples"></input>
<output message="tns:getNegativeExamplesResponse"></output>
<fault message="tns:ClientNotKnownException" name="ClientNotKnownException"></fault>
</operation>
- <operation name="init" parameterOrder="arg0 arg1">
- <input message="tns:init"></input>
- <output message="tns:initResponse"></output>
- <fault message="tns:ClientNotKnownException" name="ClientNotKnownException"></fault>
- <fault message="tns:UnknownComponentException" name="UnknownComponentException"></fault>
- <fault message="tns:ComponentInitException" name="ComponentInitException"></fault>
+ </portType>
+ <binding name="DLLearnerWebServicePortBinding" type="tns:DLLearnerWebService">
+ <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"></soap:binding>
+ <operation name="init">
+ <soap:operation soapAction=""></soap:operation>
+ <input>
+ <soap:body use="literal" namespace="http://server.dllearner.org/"></soap:body>
+ </input>
+ <output>
+ <soap:body use="literal" namespace="http://server.dllearner.org/"></soap:body>
+ </output>
+ <fault name="ClientNotKnownException">
+ <soap:fault name="ClientNotKnownException" use="literal"></soap:fault>
+ </fault>
+ <fault name="UnknownComponentException">
+ <soap:fault name="UnknownComponentException" use="literal"></soap:fault>
+ </fault>
+ <fault name="ComponentInitException">
+ <soap:fault name="ComponentInitException" use="literal"></soap:fault>
+ </fault>
</operation>
- <operation name="debug" parameterOrder="arg0">
- <input message="tns:debug"></input>
- <output message="tns:debugResponse"></output>
+ <operation name="debug">
+ <soap:operation soapAction=""></soap:operation>
+ <input>
+ <soap:body use="literal" namespace="http://server.dllearner.org/"></soap:body>
+ </input>
+ <output>
+ <soap:body use="literal" namespace="http://server.dllearner.org/"></soap:body>
+ </output>
</operation>
- <operation name="stop" parameterOrder="arg0">
- <input message="tns:stop"></input>
- <output message="tns:stopResponse"></output>
- <fault message="tns:ClientNotKnownException" name="ClientNotKnownException"></fault>
+ <operation name="stop">
+ <soap:operation soapAction=""></soap:operation>
+ <input>
+ <soap:body use="literal" namespace="http://server.dllearner.org/"></soap:body>
+ </input>
+ <output>
+ <soap:body use="literal" namespace="http://server.dllearner.org/"></soap:body>
+ </output>
+ <fault name="ClientNotKnownException">
+ <soap:fault name="ClientNotKnownException" use="literal"></soap:fault>
+ </fault>
</operation>
- <operation name="getComponents" parameterOrder="">
- <input message="tns:getComponents"></input>
- <output message="tns:getComponentsResponse"></output>
- </operation>
- </portType>
- <binding name="DLLearnerWebServicePortBinding" type="tns:DLLearnerWebService">
- <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"></soap:binding>
<operation name="getBuild">
<soap:operation soapAction=""></soap:operation>
<input>
@@ -714,6 +754,15 @@
<soap:body use="literal" namespace="http://server.dllearner.org/"></soap:body>
</output>
</operation>
+ <operation name="getComponents">
+ <soap:operation soapAction=""></soap:operation>
+ <input>
+ <soap:body use="literal" namespace="http://server.dllearner.org/"></soap:body>
+ </input>
+ <output>
+ <soap:body use="literal" namespace="http://server.dllearner.org/"></soap:body>
+ </output>
+ </operation>
<operation name="getKnowledgeSources">
<soap:operation soapAction=""></soap:operation>
<input>
@@ -1389,54 +1438,6 @@
<soap:fault name="ClientNotKnownException" use="literal"></soap:fault>
</fault>
</operation>
- <operation name="init">
- <soap:operation soapAction=""></soap:operation>
- <input>
- <soap:body use="literal" namespace="http://server.dllearner.org/"></soap:body>
- </input>
- <output>
- <soap:body use="literal" namespace="http://server.dllearner.org/"></soap:body>
- </output>
- <fault name="ClientNotKnownException">
- <soap:fault name="ClientNotKnownException" use="literal"></soap:fault>
- </fault>
- <fault name="UnknownComponentException">
- <soap:fault name="UnknownComponentException" use="literal"></soap:fault>
- </fault>
- <fault name="ComponentInitException">
- <soap:fault name="ComponentInitException" use="literal"></soap:fault>
- </fault>
- </operation>
- <operation name="debug">
- <soap:operation soapAction=""></soap:operation>
- <input>
- <soap:body use="literal" namespace="http://server.dllearner.org/"></soap:body>
- </input>
- <output>
- <soap:body use="literal" namespace="http://server.dllearner.org/"></soap:body>
- </output>
- </operation>
- <operation name="stop">
- <soap:operation soapAction=""></soap:operation>
- <input>
- <soap:body use="literal" namespace="http://server.dllearner.org/"></soap:body>
- </input>
- <output>
- <soap:body use="literal" namespace="http://server.dllearner.org/"></soap:body>
- </output>
- <fault name="ClientNotKnownException">
- <soap:fault name="ClientNotKnownException" use="literal"></soap:fault>
- </fault>
- </operation>
- <operation name="getComponents">
- <soap:operation soapAction=""></soap:operation>
- <input>
- <soap:body use="literal" namespace="http://server.dllearner.org/"></soap:body>
- </input>
- <output>
- <soap:body use="literal" namespace="http://server.dllearner.org/"></soap:body>
- </output>
- </operation>
</binding>
<service name="DLLearnerWSService">
<port name="DLLearnerWebServicePort" binding="tns:DLLearnerWebServicePortBinding">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sk...@us...> - 2008-10-28 08:55:23
|
Revision: 1464
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1464&view=rev
Author: sknappe
Date: 2008-10-28 08:54:18 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
changes to use new ontology
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/scripts/improveWikipedia/WikipediaCategoryTasks.java
trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
trunk/src/dl-learner/org/dllearner/test/TestGetExampleBug.java
trunk/src/dl-learner/org/dllearner/tools/ore/SPARQLTest.java
trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL.java
Modified: trunk/src/dl-learner/org/dllearner/scripts/improveWikipedia/WikipediaCategoryTasks.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/improveWikipedia/WikipediaCategoryTasks.java 2008-10-28 08:53:58 UTC (rev 1463)
+++ trunk/src/dl-learner/org/dllearner/scripts/improveWikipedia/WikipediaCategoryTasks.java 2008-10-28 08:54:18 UTC (rev 1464)
@@ -149,7 +149,7 @@
// NEGATIVES
AutomaticNegativeExampleFinderSPARQL aneg = new AutomaticNegativeExampleFinderSPARQL(
- fullPositiveSet, sparqlTasks);
+ fullPositiveSet, sparqlTasks, new TreeSet<String>());
aneg.makeNegativeExamplesFromParallelClasses(posExamples,
sparqlResultLimitNegativeExamples);
Modified: trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java 2008-10-28 08:53:58 UTC (rev 1463)
+++ trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java 2008-10-28 08:54:18 UTC (rev 1464)
@@ -729,29 +729,34 @@
}
@WebMethod
- public String[] getNegativeExamples(int sessionID, int componentID,String[] positives, int results, String namespace) throws ClientNotKnownException
+ public String[] getNegativeExamples(int sessionID, int componentID,String[] positives, int results, String namespace, String[] filterClasses) throws ClientNotKnownException
{
int sparqlResultSetLimit = 500;
SortedSet<String> positiveSet = new TreeSet<String>(Arrays.asList(positives));
+ SortedSet<String> filterSet = new TreeSet<String>(Arrays.asList(filterClasses));
ClientState state = getState(sessionID);
Component component = state.getComponent(componentID);
SparqlKnowledgeSource ks=(SparqlKnowledgeSource)component;
SPARQLTasks task=ks.getSPARQLTasks();
- AutomaticNegativeExampleFinderSPARQL finder=new AutomaticNegativeExampleFinderSPARQL(positiveSet,task);
+ AutomaticNegativeExampleFinderSPARQL finder=new AutomaticNegativeExampleFinderSPARQL(positiveSet,task,filterSet);
- finder.makeNegativeExamplesFromParallelClasses(positiveSet, sparqlResultSetLimit);
+ finder.makeNegativeExamplesFromNearbyClasses(positiveSet, sparqlResultSetLimit);
SortedSet<String> negExamples=finder.getNegativeExamples(results);
- if(negExamples.isEmpty()){
- finder.makeNegativeExamplesFromRelatedInstances(positiveSet, namespace);
- negExamples = finder.getNegativeExamples(results);
- if(negExamples.isEmpty()){
- finder.makeNegativeExamplesFromSuperClassesOfInstances(positiveSet, sparqlResultSetLimit);
+ if (negExamples.isEmpty()){
+ finder.makeNegativeExamplesFromParallelClasses(positiveSet, sparqlResultSetLimit);
+ negExamples=finder.getNegativeExamples(results);
+ if(negExamples.isEmpty()){
+ finder.makeNegativeExamplesFromRelatedInstances(positiveSet, namespace);
negExamples = finder.getNegativeExamples(results);
- if(negExamples.isEmpty()) {
- finder.makeNegativeExamplesFromRandomInstances();
+ if(negExamples.isEmpty()){
+ finder.makeNegativeExamplesFromSuperClassesOfInstances(positiveSet, sparqlResultSetLimit);
negExamples = finder.getNegativeExamples(results);
+ if(negExamples.isEmpty()) {
+ finder.makeNegativeExamplesFromRandomInstances();
+ negExamples = finder.getNegativeExamples(results);
+ }
}
- }
+ }
}
return negExamples.toArray(new String[negExamples.size()]);
Modified: trunk/src/dl-learner/org/dllearner/test/TestGetExampleBug.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/test/TestGetExampleBug.java 2008-10-28 08:53:58 UTC (rev 1463)
+++ trunk/src/dl-learner/org/dllearner/test/TestGetExampleBug.java 2008-10-28 08:54:18 UTC (rev 1464)
@@ -40,7 +40,7 @@
SPARQLTasks st = new SPARQLTasks(new SparqlEndpoint(new URL(OntowikiUrl)));
AutomaticNegativeExampleFinderSPARQL ane =
- new AutomaticNegativeExampleFinderSPARQL(positiveSet,st);
+ new AutomaticNegativeExampleFinderSPARQL(positiveSet,st, new TreeSet<String>());
SortedSet<String> negExamples = new TreeSet<String>();
int results=100;
if(negExamples.isEmpty()){
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/SPARQLTest.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/SPARQLTest.java 2008-10-28 08:53:58 UTC (rev 1463)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/SPARQLTest.java 2008-10-28 08:54:18 UTC (rev 1464)
@@ -20,6 +20,7 @@
package org.dllearner.tools.ore;
import java.util.SortedSet;
+import java.util.TreeSet;
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.LearningAlgorithm;
@@ -49,7 +50,7 @@
pos.makePositiveExamplesFromConcept("angela_merkel");
SortedSet<String> posExamples = pos.getPosExamples();
- AutomaticNegativeExampleFinderSPARQL neg = new AutomaticNegativeExampleFinderSPARQL(posExamples, task);
+ AutomaticNegativeExampleFinderSPARQL neg = new AutomaticNegativeExampleFinderSPARQL(posExamples, task, new TreeSet<String>());
SortedSet<String> negExamples = neg.getNegativeExamples(20);
LearnSPARQLConfiguration conf = new LearnSPARQLConfiguration();
Modified: trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL.java 2008-10-28 08:53:58 UTC (rev 1463)
+++ trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL.java 2008-10-28 08:54:18 UTC (rev 1464)
@@ -36,10 +36,12 @@
private SPARQLTasks sparqltasks;
+ private SortedSet<String> filterClasses;
private SortedSet<String> fullPositiveSet;
private SortedSet<String> fromRelated = new TreeSet<String>();
+ private SortedSet<String> fromNearbyClasses = new TreeSet<String>();
private SortedSet<String> fromSuperclasses = new TreeSet<String>();;
private SortedSet<String> fromParallelClasses = new TreeSet<String>();;
private SortedSet<String> fromRandom = new TreeSet<String>();;
@@ -58,12 +60,12 @@
*/
public AutomaticNegativeExampleFinderSPARQL(
SortedSet<String> fullPositiveSet,
- SPARQLTasks st) {
+ SPARQLTasks st, SortedSet<String> filterClasses) {
super();
this.fullPositiveSet = new TreeSet<String>();
this.fullPositiveSet.addAll(fullPositiveSet);
this.sparqltasks = st;
-
+ this.filterClasses=filterClasses;
}
@@ -86,6 +88,7 @@
*/
public SortedSet<String> getNegativeExamples(int neglimit, boolean stable ) {
SortedSet<String> negatives = new TreeSet<String>();
+ negatives.addAll(fromNearbyClasses);
negatives.addAll(fromParallelClasses);
negatives.addAll(fromRelated);
negatives.addAll(fromSuperclasses);
@@ -158,7 +161,44 @@
this.fromRelated.addAll(sparqltasks.queryAsSet(SPARQLquery, "o"));
}*/
-
+
+ public void makeNegativeExamplesFromNearbyClasses(SortedSet<String> positiveSet, int sparqlResultLimit){
+ SortedSet<String> classes = new TreeSet<String>();
+ Iterator<String> instanceIter = positiveSet.iterator();
+ while(classes.isEmpty() && instanceIter.hasNext()) {
+ classes.addAll(sparqltasks.getClassesForInstance(instanceIter.next(), 100));
+ }
+ String concept=classes.first();
+ if (filterClasses!=null&&filterClasses.size()>0){
+ boolean br=false;
+ for (String oneClass : classes){
+ Iterator<String> iter=filterClasses.iterator();
+ while (iter.hasNext()){
+ if (!oneClass.startsWith(iter.next())){
+ concept=oneClass;
+ br=true;
+ break;
+ }
+ }
+ if (br) break;
+ }
+ }
+ concept = concept.replaceAll("\"", "");
+ SortedSet<String> superClasses = sparqltasks.getSuperClasses(concept, 1);
+
+ classes = new TreeSet<String>();
+ for (String oneSuperClass : superClasses) {
+ classes.addAll(sparqltasks.getSubClasses(oneSuperClass, 1));
+ }
+ classes.remove(concept);
+ for (String oneClass : classes) {
+ fromNearbyClasses.addAll(sparqltasks.retrieveInstancesForClassDescription("\""
+ + oneClass + "\"", sparqlResultLimit));
+ }
+
+ this.fromNearbyClasses.removeAll(fullPositiveSet);
+ }
+
/**
* makes negEx from classes, the posEx belong to.
* Gets all Classes from PosEx, gets Instances from these Classes, returns all
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sk...@us...> - 2008-10-28 07:16:27
|
Revision: 1462
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1462&view=rev
Author: sknappe
Date: 2008-10-28 07:16:14 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
test r?\195?\188ckg?\195?\164ngig
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL.java
Modified: trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL.java 2008-10-28 07:15:38 UTC (rev 1461)
+++ trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL.java 2008-10-28 07:16:14 UTC (rev 1462)
@@ -189,7 +189,6 @@
}
logger.debug("getting negExamples from " + classes.size() + " parallel classes");
for (String oneClass : classes) {
- System.out.println(oneClass);
logger.debug(oneClass);
// rsc = new
// JenaResultSetConvenience(queryConcept("\""+oneClass+"\"",limit));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sk...@us...> - 2008-10-28 07:15:47
|
Revision: 1461
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1461&view=rev
Author: sknappe
Date: 2008-10-28 07:15:38 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
bugfix
Modified Paths:
--------------
trunk/src/dbpedia-navigator/ajax_get_article.php
Modified: trunk/src/dbpedia-navigator/ajax_get_article.php
===================================================================
--- trunk/src/dbpedia-navigator/ajax_get_article.php 2008-10-28 07:11:28 UTC (rev 1460)
+++ trunk/src/dbpedia-navigator/ajax_get_article.php 2008-10-28 07:15:38 UTC (rev 1461)
@@ -116,10 +116,6 @@
$content.=', <img src="images/flickr.png" alt="Flickr" style="max-width:20px;" /> <a href="'.$triples['http://dbpedia.org/property/hasPhotoCollection'][0]['value'].'" onclick="window.open(\''.$triples['http://dbpedia.org/property/hasPhotoCollection'][0]['value'].'\',\'Wikiwindow\',\'width=800,height=500,top=50,left=50,scrollbars=yes\');return false;">view photo collection</a></p>';
}
- $content .= '<br/><hr><h4>Further Information</h4><br/>';
- // detect appropriate template (currently always default)
- $template = new DefaultTemplate();
-
//display owl:sameAs properties
if (isset($triples['http://www.w3.org/2002/07/owl#sameAs'])||isset($subjecttriples['http://www.w3.org/2002/07/owl#sameAs'])){
$content.='<br/><hr><h4>Same as</h4><br/>';
@@ -268,6 +264,9 @@
// have already been displayed
filterTriples(&$triples, &$subjecttriples);
+ $content .= '<br/><hr><h4>Further Information</h4><br/>';
+ // detect appropriate template (currently always default)
+ $template = new DefaultTemplate();
// display template for this instance (currently the template is similar to the remaining
// instance view apart from beautifications)
$content .= $template->printTemplate($triples,$subjecttriples);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sk...@us...> - 2008-10-28 07:11:39
|
Revision: 1460
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1460&view=rev
Author: sknappe
Date: 2008-10-28 07:11:28 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
bugfix
Modified Paths:
--------------
trunk/src/dbpedia-navigator/templates/CityTemplate.php
trunk/src/dbpedia-navigator/templates/PersonTemplate.php
Modified: trunk/src/dbpedia-navigator/templates/CityTemplate.php
===================================================================
--- trunk/src/dbpedia-navigator/templates/CityTemplate.php 2008-10-28 07:08:15 UTC (rev 1459)
+++ trunk/src/dbpedia-navigator/templates/CityTemplate.php 2008-10-28 07:11:28 UTC (rev 1460)
@@ -28,7 +28,7 @@
*/
class CityTemplate extends PopulatedPlaceTemplate {
- function printTemplate($triples) {
+ function printTemplate($triples,$subjecttriples) {
$content = "";
$content .= '<table>';
$content .= '<tr><td colspan="2">City Information</td></tr>';
Modified: trunk/src/dbpedia-navigator/templates/PersonTemplate.php
===================================================================
--- trunk/src/dbpedia-navigator/templates/PersonTemplate.php 2008-10-28 07:08:15 UTC (rev 1459)
+++ trunk/src/dbpedia-navigator/templates/PersonTemplate.php 2008-10-28 07:11:28 UTC (rev 1460)
@@ -24,10 +24,10 @@
*/
class PersonTemplate extends AbstractTemplate {
- function printTemplate($triples) {
+ function printTemplate($triples,$subjecttriples) {
$content = "";
- $content .= $this->printRemainingTriples($triples);
+ $content .= $this->printRemainingTriples($triples,$subjecttriples);
return $content;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sk...@us...> - 2008-10-28 07:08:25
|
Revision: 1459
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1459&view=rev
Author: sknappe
Date: 2008-10-28 07:08:15 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
test
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/scripts/GeoInference.java
Modified: trunk/src/dl-learner/org/dllearner/scripts/GeoInference.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/GeoInference.java 2008-10-28 07:06:00 UTC (rev 1458)
+++ trunk/src/dl-learner/org/dllearner/scripts/GeoInference.java 2008-10-28 07:08:15 UTC (rev 1459)
@@ -51,7 +51,7 @@
BufferedWriter out = new BufferedWriter(new FileWriter(outputFile));
// db.aksw.org SPARQL endpoint
- SparqlEndpoint endpoint = SparqlEndpoint.getEndpointLOCALGeonames();
+ SparqlEndpoint endpoint = null;//SparqlEndpoint.getEndpointLOCALGeonames();
SPARQLTasks st = new SPARQLTasks(endpoint);
URI test = URI.create("http://sws.geonames.org/2959441/");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
3 messages has been excluded from this view by a project administrator.
