Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1930] trunk
|
From: <lor...@us...> - 2009-12-14 20:14:39
|
Revision: 1930
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1930&view=rev
Author: lorenz_b
Date: 2009-12-14 20:14:32 +0000 (Mon, 14 Dec 2009)
Log Message:
-----------
Modified build task.
Provided showing executed actions in last step.
Modified Paths:
--------------
trunk/build.xml
trunk/src/dl-learner/org/dllearner/tools/ore/OREApplication.java
trunk/src/dl-learner/org/dllearner/tools/ore/OntologyModifier.java
trunk/src/dl-learner/org/dllearner/tools/ore/RepairManager.java
Removed Paths:
-------------
trunk/src/dl-learner/org/dllearner/tools/ore/log4j.properties
Property Changed:
----------------
trunk/
Property changes on: trunk
___________________________________________________________________
Modified: svn:ignore
- .lastUsedExample
.settings
.project
.classpath
classes
log
cache
cachePersistant
reports
results
local
rdbtoonto
the_log.txt
tmp
fragmentOntology.owl
output
ling
+ .lastUsedExample
.settings
.project
.classpath
classes
log
cache
cachePersistant
reports
results
local
rdbtoonto
the_log.txt
tmp
fragmentOntology.owl
output
ling
bin
log
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2009-12-08 21:47:58 UTC (rev 1929)
+++ trunk/build.xml 2009-12-14 20:14:32 UTC (rev 1930)
@@ -15,6 +15,9 @@
<property name="version_dir" value="dllearner-${today}" />
<property name="release_tmp_dir" value="release/${version_dir}" />
<property name="release_php_client_tmp_dir" value="release/php-client-${today}" />
+ <property name="release_ore_dir" value="release/ore-${today}" />
+ <property name="version_ore_dir" value="ore-${today}" />
+
<!-- other settings -->
<!-- maximum amount of allocated memory in startup scripts -->
@@ -493,58 +496,58 @@
<!-- we also need to copy some images, which should be
included in dllearner.jar -->
<copy toDir="classes_tmp" >
- <fileset dir="${source_dir}" includes="**/*.gif,**/*.html,**/*.txt"/>
+ <fileset dir="${source_dir}" includes="**/*.gif,**/*.png,**/*.html,**/*.txt"/>
</copy>
- <mkdir dir="${release_tmp_dir}"/>
- <mkdir dir="${release_tmp_dir}/lib/"/>
- <jar jarfile="${release_tmp_dir}/lib/dllearner.jar">
+ <mkdir dir="${release_ore_dir}"/>
+ <mkdir dir="${release_ore_dir}/lib/"/>
+ <jar jarfile="${release_ore_dir}/lib/dllearner.jar">
<fileset dir="classes_tmp"/>
</jar>
<delete dir="classes_tmp"/>
<!-- copy all other libraries -->
- <copy toDir="${release_tmp_dir}/lib">
+ <copy toDir="${release_ore_dir}/lib">
<fileset dir="${lib_dir}" />
</copy>
<!-- copy binary files and examples -->
- <copy toDir="${release_tmp_dir}/examples">
- <fileset dir="examples"/>
+ <copy toDir="${release_ore_dir}/examples">
+ <fileset dir="examples/ore"/>
</copy>
- <copy toDir="${release_tmp_dir}">
+ <copy toDir="${release_ore_dir}">
<fileset dir="bin"/>
</copy>
<!-- create file containing the build info -->
- <echo file="${release_tmp_dir}/build.txt" append="false">DL-Learner Build ${today}</echo>
+ <echo file="${release_ore_dir}/build.txt" append="false">ORE Build ${today}</echo>
<!-- create empty log directory for release -->
- <mkdir dir="${release_tmp_dir}/log" />
+ <mkdir dir="${release_ore_dir}/log" />
<!-- create tar.gz files (allows storing whether a file is executable) -->
<tar longfile="gnu" destfile="ore-nosource-${today}.tar.gz" compression="gzip">
<!-- extra set for executable files -->
<tarfileset dir="release/" mode="755">
- <include name="${version_dir}/OREApplication" />
+ <include name="${version_ore_dir}/ore" />
</tarfileset>
<tarfileset dir="release/">
- <exclude name="${version_dir}/OREApplication"/>
+ <exclude name="${version_ore_dir}/ore"/>
</tarfileset>
</tar>
<!-- copy source code -->
- <mkdir dir="${release_tmp_dir}/src/"/>
- <copy toDir="${release_tmp_dir}/src/">
- <fileset dir="${source_dir}" includes="**/*.java,**/*.html,**/*.gif,**/*.jjt,build.xml"/>
+ <mkdir dir="${release_ore_dir}/src/"/>
+ <copy toDir="${release_ore_dir}/src/">
+ <fileset dir="${source_dir}" includes="**/*.java,**/*.html,**/*.gif,**/*.png,*/*.jjt,build.xml"/>
</copy>
<!-- create backup (= standard build + source code + developer documentation) -->
<tar longfile="gnu" destfile="ore-${today}.tar.gz" compression="gzip">
<tarfileset dir="release/" mode="755">
- <include name="${version_dir}/OREApplication" />
+ <include name="${version_ore_dir}/ore" />
</tarfileset>
<tarfileset dir="release/">
- <exclude name="${version_dir}/OREApplication"/>
+ <exclude name="${version_ore_dir}/ore"/>
</tarfileset>
</tar>
<delete dir="release"/>
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/OREApplication.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/OREApplication.java 2009-12-08 21:47:58 UTC (rev 1929)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/OREApplication.java 2009-12-14 20:14:32 UTC (rev 1930)
@@ -23,8 +23,6 @@
import java.awt.Dimension;
import java.awt.Font;
import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.util.Collections;
import java.util.Comparator;
import java.util.Locale;
@@ -36,7 +34,6 @@
import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.plaf.FontUIResource;
-import org.apache.log4j.PropertyConfigurator;
import org.dllearner.tools.ore.ui.wizard.Wizard;
import org.dllearner.tools.ore.ui.wizard.WizardPanelDescriptor;
import org.dllearner.tools.ore.ui.wizard.descriptors.AutoLearnPanelDescriptor;
@@ -61,13 +58,9 @@
* @param args possible is to use URI as parameter
*/
public static void main(String[] args) {
- try {
- PropertyConfigurator.configure(new URL("file:src/dl-learner/org/dllearner/tools/ore/log4j.properties"));
- } catch (MalformedURLException e1) {
- e1.printStackTrace();
- }
+
try {
// UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName());
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/OntologyModifier.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/OntologyModifier.java 2009-12-08 21:47:58 UTC (rev 1929)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/OntologyModifier.java 2009-12-14 20:14:32 UTC (rev 1930)
@@ -20,7 +20,6 @@
package org.dllearner.tools.ore;
-import java.io.File;
import java.net.URI;
import java.util.ArrayList;
import java.util.Collection;
@@ -40,7 +39,6 @@
import org.dllearner.reasoning.PelletReasoner;
import org.dllearner.utilities.owl.OWLAPIConverter;
import org.dllearner.utilities.owl.OWLAPIDescriptionConvertVisitor;
-import org.semanticweb.owl.io.OWLXMLOntologyFormat;
import org.semanticweb.owl.model.AddAxiom;
import org.semanticweb.owl.model.OWLAxiom;
import org.semanticweb.owl.model.OWLClass;
@@ -57,9 +55,7 @@
import org.semanticweb.owl.model.OWLOntologyChange;
import org.semanticweb.owl.model.OWLOntologyChangeException;
import org.semanticweb.owl.model.OWLOntologyManager;
-import org.semanticweb.owl.model.OWLOntologyStorageException;
import org.semanticweb.owl.model.RemoveAxiom;
-import org.semanticweb.owl.model.UnknownOWLOntologyException;
import org.semanticweb.owl.util.OWLEntityRemover;
/**
@@ -74,14 +70,18 @@
private OWLDataFactory factory;
private OWLOntologyManager manager;
+ private Set<OWLOntologyChange> globalChanges;
+
public OntologyModifier(PelletReasoner reasoner){
this.reasoner = reasoner;
this.manager = reasoner.getOWLOntologyManager();
this.factory = manager.getOWLDataFactory();
this.ontology = (reasoner.getOWLAPIOntologies());
+ globalChanges = new HashSet<OWLOntologyChange>();
+
}
/**
@@ -105,10 +105,12 @@
AddAxiom axiom = new AddAxiom(ontology, axiomOWLAPI);
try {
manager.applyChange(axiom);
+ globalChanges.add(axiom);
} catch (OWLOntologyChangeException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
+
return axiom;
}
@@ -146,6 +148,7 @@
//apply changes to ontology
try {
manager.applyChanges(changes);
+ globalChanges.addAll(changes);
} catch (OWLOntologyChangeException e) {
System.err.println("Error: rewriting class description failed");
e.printStackTrace();
@@ -173,16 +176,14 @@
try {
reasoner.updateCWAOntology(changes);
manager.applyChanges(changes);
- return changes;
+ globalChanges.addAll(changes);
} catch (OWLOntologyChangeException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
+ return changes;
-
- return null;
-
}
/**
* Removes a classAssertion.
@@ -204,15 +205,13 @@
try {
reasoner.updateCWAOntology(changes);
manager.applyChange(rm);
- return changes;
+ globalChanges.addAll(changes);
} catch (OWLOntologyChangeException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
-
-
- return null;
+ return changes;
}
/**
@@ -235,16 +234,16 @@
try {
reasoner.updateCWAOntology(changes);
manager.applyChange(am);
- return changes;
+ globalChanges.addAll(changes);
} catch (OWLOntologyChangeException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
+
+ return changes;
- return null;
-
}
/**
@@ -277,14 +276,16 @@
try {
reasoner.updateCWAOntology(changes);
manager.applyChanges(changes);
- return changes;
+ globalChanges.addAll(changes);
} catch (OWLOntologyChangeException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
- return null;
+ return changes;
+
+
}
/**
@@ -335,13 +336,14 @@
try {
reasoner.updateCWAOntology(changes);
manager.applyChanges(changes);
- return changes;
+ globalChanges.addAll(changes);
} catch (OWLOntologyChangeException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
- return null;
+
+ return changes;
}
@@ -378,7 +380,7 @@
if(remove != null){
reasoner.updateCWAOntology(changes);
manager.applyChange(remove);
- return changes;
+ globalChanges.addAll(changes);
}
} catch (OWLOntologyChangeException e) {
@@ -386,7 +388,7 @@
e.printStackTrace();
}
- return null;
+ return changes;
}
@@ -412,13 +414,12 @@
try {
reasoner.updateCWAOntology(changes);
manager.applyChanges(changes);
- return changes;
-
-
+ globalChanges.addAll(changes);
} catch (OWLOntologyChangeException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
+
return changes;
}
@@ -443,16 +444,24 @@
try {
reasoner.updateCWAOntology(changes);
manager.applyChange(axiom);
- return changes;
+ globalChanges.addAll(changes);
} catch (OWLOntologyChangeException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
- return null;
+ return changes;
}
-
+ public void applyOntologyChanges(List<OWLOntologyChange> changes){
+ try {
+ manager.applyChanges(changes);
+ } catch (OWLOntologyChangeException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ globalChanges.addAll(changes);
+ }
/**
* undo changes of type {@link OWLOntologyChange}.
@@ -478,7 +487,7 @@
// TODO Auto-generated catch block
e.printStackTrace();
}
-
+ globalChanges.removeAll(changes);
}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/RepairManager.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/RepairManager.java 2009-12-08 21:47:58 UTC (rev 1929)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/RepairManager.java 2009-12-14 20:14:32 UTC (rev 1930)
@@ -145,13 +145,14 @@
}
public void executeRepairPlan(){
-
- try {
- manager.applyChanges(new ArrayList<OWLOntologyChange>(repairPlan));
- } catch (OWLOntologyChangeException e) {
- System.out.println("Error in Repairmanager: Couldn't apply ontology changes");
- e.printStackTrace();
- }
+ OREManager.getInstance().getModifier().applyOntologyChanges(new ArrayList<OWLOntologyChange>(repairPlan));
+// try {
+//
+// manager.applyChanges(new ArrayList<OWLOntologyChange>(repairPlan));
+// } catch (OWLOntologyChangeException e) {
+// System.out.println("Error in Repairmanager: Couldn't apply ontology changes");
+// e.printStackTrace();
+// }
undoStack.push(new ArrayList<OWLOntologyChange>(repairPlan));
List<OWLOntologyChange> changes = new ArrayList<OWLOntologyChange>(repairPlan);
@@ -163,14 +164,14 @@
public void undo(){
List<OWLOntologyChange> changes = undoStack.pop();
redoStack.push(changes);
+ OREManager.getInstance().getModifier().applyOntologyChanges(getInverseChanges(changes));
+// try {
+// manager.applyChanges(getInverseChanges(changes));
+// } catch (OWLOntologyChangeException e) {
+// System.out.println("Error in Repairmanager: Couldn't apply ontology changes");
+// e.printStackTrace();
+// }
- try {
- manager.applyChanges(getInverseChanges(changes));
- } catch (OWLOntologyChangeException e) {
- System.out.println("Error in Repairmanager: Couldn't apply ontology changes");
- e.printStackTrace();
- }
-
fireRepairPlanExecuted(changes);
}
Deleted: trunk/src/dl-learner/org/dllearner/tools/ore/log4j.properties
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/log4j.properties 2009-12-08 21:47:58 UTC (rev 1929)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/log4j.properties 2009-12-14 20:14:32 UTC (rev 1930)
@@ -1,6 +0,0 @@
-log4j.rootLogger=INFO, A
-log4j.logger.org.dllearner.tools.ore.explanation = DEBUG, A
-log4j.logger.org.dllearner.tools.ore.explanation.HSTExplanationGenerator = INFO, A
-log4j.appender.A=org.apache.log4j.ConsoleAppender
-log4j.appender.A.layout=org.apache.log4j.PatternLayout
-log4j.appender.A.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c: %m%n
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
