Modified DDPLReasoner2 and translator to handle permissions properly; updated user manual

Author: lexeree

normative_supervisor/supervisor/normsys/DDPLTranslator.java

@@ -104,7 +104,7 @@ public void labelsToFacts(Environment env) {
 		for(String lab : env.getNegLabels()) {
 			Literal lit = new Literal(lab);
 			Literal nlit = lit.getComplementClone();
-			Rule fact = new Rule(lab, RuleType.FACT);
+			Rule fact = new Rule(lab, RuleType.DEFEASIBLE);
 			try {
 				fact.addHeadLiteral(nlit);
 			} catch (RuleException e) {}
@@ -240,10 +240,9 @@ public void generateDefeaters() {
 				permr.addHeadLiteral(lit);
 				permr.setMode(perm);
 				norms.add(permr);
-				Literal litp = lit.cloneWithMode(perm);
-				rule.addBodyLiteral(litp);
-				rule.addHeadLiteral(lit);
-				rule.setMode(obl);
+				rule.addBodyLiteral(lit.cloneWithMode(perm));
+				rule.addHeadLiteral(lit.getComplementClone());
+				//rule.setMode(obl);
 				norms.add(rule);
 			}
 			catch (RuleException e) {

normative_supervisor/supervisor/reasoner/DDPLReasoner2.java

@@ -72,7 +72,7 @@ public void reason() {
 			gameState.setTheory(copy.clone());
 			try {
 				Literal lit = new Literal(act);
-				Rule fct = new Rule(lit.getName(), RuleType.FACT);
+				Rule fct = new Rule(lit.getName(), RuleType.DEFEASIBLE);
 				fct.addHeadLiteral(lit);
 				ArrayList<Rule> fcts = new ArrayList<Rule>();
 				fcts.add(fct);