[DL-Learner SVN] SF.net SVN: dl-learner:[3208] trunk/interfaces/src/main/java/org/dllearner/ cli/Enrichment.java

[<lor...@us...>]

Revision: 3208
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3208&view=rev
Author:   lorenz_b
Date:     2011-09-01 17:45:52 +0000 (Thu, 01 Sep 2011)
Log Message:
-----------
Added more output format options - up to now: turtle, rdf, n-triples

Modified Paths:
--------------
    trunk/interfaces/src/main/java/org/dllearner/cli/Enrichment.java

Modified: trunk/interfaces/src/main/java/org/dllearner/cli/Enrichment.java
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/cli/Enrichment.java	2011-09-01 17:10:43 UTC (rev 3207)
+++ trunk/interfaces/src/main/java/org/dllearner/cli/Enrichment.java	2011-09-01 17:45:52 UTC (rev 3208)
@@ -723,33 +723,37 @@
 			// print output in correct format
 			if(options.has("f")) {
 				// TODO: handle other formats
+				List<AlgorithmRun> runs = e.getAlgorithmRuns();
+				List<OWLAxiom> axioms = new LinkedList<OWLAxiom>();
+				for(AlgorithmRun run : runs) {
+					axioms.addAll(e.toRDF(run.getAxioms(), run.getAlgorithm(), run.getParameters(), ks));
+				}
+				Model model = e.getModel(axioms);
 				if(options.valueOf("f").equals("turtle")) {
-					List<AlgorithmRun> runs = e.getAlgorithmRuns();
-					List<OWLAxiom> axioms = new LinkedList<OWLAxiom>();
-					for(AlgorithmRun run : runs) {
-						axioms.addAll(e.toRDF(run.getAxioms(), run.getAlgorithm(), run.getParameters(), ks));
+					if(options.has("o")) {
+						model.write(new FileOutputStream(f), "TURTLE");
+					} else {
+						System.out.println("ENRICHMENT[");
+						model.write(System.out, "N-TRIPLES");
+						System.out.println("]");
 					}
-					Model model = e.getModel(axioms);
-					for(Statement st : model.listStatements().toList()){
-						System.out.println("--------------------");
-//						System.out.println(st);
-						if(st.getSubject().isResource()){
-							System.out.println(st.getSubject());
-						}
-						System.out.println(st.getPredicate());
-						if(st.getObject().isResource()){
-							
-						}
-						System.out.println(st.getObject());
+				} else if(options.valueOf("f").equals("rdf")){
+					if(options.has("o")) {
+						model.write(new FileOutputStream(f), "RDF/XML");
+					} else {
+						System.out.println("ENRICHMENT[");
+						model.write(System.out, "N-TRIPLES");
+						System.out.println("]");
 					}
+				} else if(options.valueOf("f").equals("n-triples")){
 					if(options.has("o")) {
-						model.write(new FileOutputStream(f));
+						model.write(new FileOutputStream(f), "N-TRIPLES");
 					} else {
 						System.out.println("ENRICHMENT[");
-						model.write(System.out);
+						model.write(System.out, "N-TRIPLES");
 						System.out.println("]");
 					}
-				}
+				} 
 			}
 			
 		}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.