增加了专门用于删除非推理结果的三元组的功能

和RDFSOWLReasoner

Author: gibeon

mrj-0.1/src/cn/edu/neu/mitt/mrj/io/dbs/CassandraDB.java

@@ -23,9 +23,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.cassandra.cql3.QueryProcessor;
-import org.apache.cassandra.cql3.UntypedResultSet;
-import org.apache.cassandra.db.marshal.TupleType;
 import org.apache.cassandra.exceptions.RequestExecutionException;
 import org.apache.cassandra.thrift.Cassandra;
 import org.apache.cassandra.thrift.Column;
@@ -60,11 +57,9 @@
 import com.datastax.driver.core.Statement;
 //modified  cassandra java 2.0.5
 import com.datastax.driver.core.TupleValue;
+import com.datastax.driver.core.querybuilder.Delete.Where;
 import com.datastax.driver.core.querybuilder.QueryBuilder;
-
-
 //modified 
-import org.apache.cassandra.thrift.CassandraServer;
 
 
 /**
@@ -582,7 +577,7 @@ public Map<Long, Collection<Long>> loadMapIntoMemory(Set<Integer> filters) throw
 		return loadMapIntoMemory(filters, false);
 	}
 
-	// 返回的key就是triple的subject，value是object
+	// ���ص�key����triple��subject��value��object
 	public Map<Long, Collection<Long>> loadMapIntoMemory(Set<Integer> filters, boolean inverted) throws IOException, InvalidRequestException, UnavailableException, TimedOutException, SchemaDisagreementException, TException {
 		long startTime = System.currentTimeMillis();
 
@@ -648,7 +643,18 @@ public void createIndexOnRule() throws InvalidRequestException, UnavailableExcep
 		client.execute_cql3_query(ByteBufferUtil.bytes(query), Compression.NONE, ConsistencyLevel.ONE);
 	}
 
-	
+	// Added by WuGang 2015-06-08
+	public static void removeOriginalTriples(){
+		SimpleClientDataStax scds = new SimpleClientDataStax();
+		scds.connect(DEFAULT_HOST);
+		
+		Where dQuery = QueryBuilder.delete()
+				.from(KEYSPACE, COLUMNFAMILY_JUSTIFICATIONS)
+				.where(QueryBuilder.eq(COLUMN_RULE, ByteBufferUtil.bytes(0)));
+		scds.getSession().execute(dQuery);
+		
+		scds.close();		
+	}
 
 	public static void main(String[] args) {
 		try {

mrj-0.1/src/cn/edu/neu/mitt/mrj/reasoner/RDFSOWLReasoner.java

@@ -0,0 +1,74 @@
+package cn.edu.neu.mitt.mrj.reasoner;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import cn.edu.neu.mitt.mrj.reasoner.owl.OWLReasoner;
+import cn.edu.neu.mitt.mrj.reasoner.rdfs.RDFSReasoner;
+
+public class RDFSOWLReasoner {
+	
+	protected static Logger log = LoggerFactory.getLogger(RDFSOWLReasoner.class);
+	
+	static int step = 0;
+	
+	private static void parseArgs(String[] args) {
+		
+		for(int i=0;i<args.length; ++i) {
+			if (args[i].equalsIgnoreCase("--startingStep")) {
+				RDFSOWLReasoner.step = Integer.valueOf(args[++i]);
+			}
+
+		}
+	}
+
+	public static void main(String[] args) {
+		if (args.length < 1) {
+			System.out.println("USAGE: RDFSOWLReasoner [pool path] [options]");
+			return;
+		}
+		
+		parseArgs(args);
+		
+		RDFSReasoner rdfsReasoner = new RDFSReasoner();
+		OWLReasoner owlReasoner = new OWLReasoner();
+		try {
+			long totalDerivation = 0;
+			boolean continueDerivation = true;
+			long startTime = System.currentTimeMillis();
+			long rdfsDerivation = 0;
+			long owlDerivation = 0;
+			boolean firstLoop = true;
+			
+			while (continueDerivation) {
+				//Do RDFS reasoning
+				if (owlDerivation == 0 && !firstLoop) {
+					rdfsDerivation = 0;
+				} else {
+					RDFSReasoner.step = RDFSOWLReasoner.step;
+					rdfsDerivation = rdfsReasoner.launchDerivation(args);
+				}
+				
+				//Do OWL reasoning
+				if (rdfsDerivation == 0 && !firstLoop) {
+					owlDerivation = 0;
+				} else {
+					OWLReasoner.step = RDFSReasoner.step;
+					owlDerivation = owlReasoner.launchClosure(args);
+					RDFSOWLReasoner.step = OWLReasoner.step;
+				}
+				totalDerivation += owlDerivation + rdfsDerivation;
+				continueDerivation = (owlDerivation + rdfsDerivation) > 0;
+				firstLoop = false;
+			}
+//			log.info("Number triples derived: " + totalDerivation);
+//			log.info("Time derivation: " + (System.currentTimeMillis() - startTime));
+			System.out.println("Number triples derived: " + totalDerivation);
+			System.out.println("Time derivation: " + (System.currentTimeMillis() - startTime));
+		} catch (Exception e) {
+			log.error(e.getMessage());
+			e.printStackTrace();
+		}
+	}
+	
+}

mrj-0.1/src/cn/edu/neu/mitt/mrj/reasoner/owl/OWLEquivalenceSCSPMapper.java

@@ -95,15 +95,15 @@ public void setup(Context context) throws IOException {
 				Set<Integer> filters = new HashSet<Integer>();
 				filters.add(TriplesUtils.SCHEMA_TRIPLE_SUBPROPERTY);
 				//modified 2015/5/31
-				//db.loadSetIntoMemory(subpropSchemaTriples, filters, -1);
+				db.loadSetIntoMemory(subpropSchemaTriples, filters, -1);
 			}
 
 			if (subclassSchemaTriples == null) {
 				subclassSchemaTriples = new HashSet<Long>();
 				Set<Integer> filters = new HashSet<Integer>();
 				filters.add(TriplesUtils.SCHEMA_TRIPLE_SUBCLASS);
 				//modified 2015/5/31
-				//db.loadSetIntoMemory(subclassSchemaTriples, filters, -1);
+				db.loadSetIntoMemory(subclassSchemaTriples, filters, -1);
 			}
 			db.CassandraDBClose();
 			//modified 2015/5/31

mrj-0.1/src/cn/edu/neu/mitt/mrj/reasoner/owl/OWLReasoner.java

@@ -37,7 +37,7 @@ public class OWLReasoner extends Configured implements Tool {
 	public static final String OWL_PROP_INHERITANCE_TMP = "/dir-tmp-prop-inheritance/";
 	public static final String OWL_PROP_INHERITANCE = "/dir-prop-inheritance/";
 	public static final String OWL_TRANSITIVITY_BASE = OWL_PROP_INHERITANCE_TMP + "dir-transitivity-base/";
-	public static final String OWL_TRANSITIVITY = "dir-transitivity/";	// Added by WuGang 2010-08-25，新加的目录
+	public static final String OWL_TRANSITIVITY = "dir-transitivity/";	// Added by WuGang 2010-08-25���¼ӵ�Ŀ¼
 
 	public static final String OWL_SYNONYMS_TABLE = "dir-table-synonyms/";
 	public static final String OWL_SYNONYMS_TABLE_NEW = "_table_synonyms_new/";
@@ -154,15 +154,15 @@ public long launchClosure(String[] args) throws IOException, InterruptedExceptio
 				break;
 			currentStep++;
 			long hasValueDerivation = inferHasValueStatements(args);
-			System.out.println("-----------inferHasValueStatements结束");
+			System.out.println("-----------inferHasValueStatements����");
 			derivedTriples += hasValueDerivation;
 			if (hasValueDerivation > 0) lastDerivationStep = currentStep;
 
 			if (!firstCycle && lastDerivationStep == (currentStep - 4))
 				break;
 			currentStep++;
 			long someAllDerivation = inferSomeAndAllValuesStatements(args);
-			System.out.println("-----------inferSomeAndAllValuesStatements结束");
+			System.out.println("-----------inferSomeAndAllValuesStatements����");
 			derivedTriples += someAllDerivation;
 			if (someAllDerivation > 0) lastDerivationStep = currentStep;
 
@@ -230,7 +230,7 @@ private long inferPropertiesInheritance(String[] args) throws IOException, Inter
 	private long inferTransitivityStatements(String[] args) 
 											throws IOException, InterruptedException, ClassNotFoundException {
 		boolean derivedNewStatements = true;
-//		System.out.println("在inferTransitivityStatements里头。");
+//		System.out.println("��inferTransitivityStatements��ͷ��");
 
 		// We'll not use filesystem but db.getTransitiveStatementsCount()
 		long derivation = 0;
@@ -242,7 +242,7 @@ private long inferTransitivityStatements(String[] args)
 		//modified 2015/5/19
 		//for(int i = 0;i <= 3; i++){
 		while ((beforeInferCount > 0) && derivedNewStatements && shouldInferTransitivity) {
-//			System.out.println("开始在inferTransitivityStatements的while循环中寻找。");
+//			System.out.println("��ʼ��inferTransitivityStatements��whileѭ����Ѱ�ҡ�");
 			level++;
 
 			//Configure input. Take only the directories that are two levels below
@@ -435,10 +435,10 @@ private long inferEquivalenceStatements(String[] args) throws IOException, Inter
 		step++;
 
 		Set<Integer> filters = new HashSet<Integer>();
-		filters.add(TriplesUtils.SCHEMA_TRIPLE_SUBCLASS);
-		filters.add(TriplesUtils.SCHEMA_TRIPLE_SUBPROPERTY);
-		filters.add(TriplesUtils.SCHEMA_TRIPLE_EQUIVALENT_CLASS);
-		filters.add(TriplesUtils.SCHEMA_TRIPLE_EQUIVALENT_PROPERTY);
+//		filters.add(TriplesUtils.SCHEMA_TRIPLE_SUBCLASS);
+//		filters.add(TriplesUtils.SCHEMA_TRIPLE_SUBPROPERTY);
+//		filters.add(TriplesUtils.SCHEMA_TRIPLE_EQUIVALENT_CLASS);
+//		filters.add(TriplesUtils.SCHEMA_TRIPLE_EQUIVALENT_PROPERTY);
 
 		Job job = MapReduceReasonerJobConfig.createNewJob(
 				OWLReasoner.class,