Rename Subsumption algorithms

AFellner · Aug 5, 2013 · 1daa054 · 1daa054
1 parent 6fb9ce6
commit 1daa054
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/main/scala/at/logic/skeptik/algorithm/compressor/Subsumption.scala b/src/main/scala/at/logic/skeptik/algorithm/compressor/Subsumption.scala
@@ -12,7 +12,7 @@ import scala.collection.immutable.{HashSet => ISet}
 abstract class AbstractSubsumption 
 extends (Proof[SequentProofNode] => Proof[SequentProofNode])
 
-object FWS extends AbstractSubsumption {
+object TopDownLeftRightSubsumption extends AbstractSubsumption {
 
   def apply(proof: Proof[SequentProofNode]) = {
     val nodeMap = new MMap[Sequent,SequentProofNode]
@@ -41,7 +41,7 @@ object FWS extends AbstractSubsumption {
   }
 }
 
-abstract class BWS extends AbstractSubsumption {
+abstract class BottomUpRightLeftSubsumption extends AbstractSubsumption {
   val nodeMap = new MMap[Sequent,SequentProofNode]
   val replaceNodes = new MMap[SequentProofNode,SequentProofNode]
 
@@ -58,7 +58,7 @@ abstract class BWS extends AbstractSubsumption {
 
     node match {
       case Axiom(conclusion) => nodeMap += (conclusion -> node)
-      case R(_,_,_,_) => nodeMap += (node.conclusion -> node)
+      case R(_, _, _, _) => nodeMap += (node.conclusion -> node)
       case _ => Unit
     }
   }
@@ -85,7 +85,7 @@ abstract class BWS extends AbstractSubsumption {
   }
 }
 
-object BWSt extends BWS {
+object BottomUpRightLeftSubsumptionTime extends BottomUpRightLeftSubsumption {
   val ancestors = new MMap[SequentProofNode,ISet[SequentProofNode]]
   def notAncestor(node: SequentProofNode, ancestor: SequentProofNode):Boolean = {
     !(ancestors.getOrElseUpdate(node, computeAncestors(node)) contains ancestor)
@@ -99,7 +99,7 @@ object BWSt extends BWS {
   }
 }
 
-object BWSm extends BWS {
+object BottomUpRightLeftSubsumptionMemory extends BottomUpRightLeftSubsumption {
   def notAncestor(node: SequentProofNode, ancestor: SequentProofNode):Boolean = {
     !(node existsAmongAncestors {_ eq ancestor})
   }

diff --git a/src/main/scala/at/logic/skeptik/algorithm/compressor/package.scala b/src/main/scala/at/logic/skeptik/algorithm/compressor/package.scala
@@ -28,8 +28,8 @@ package object compressor {
     "MSplit2" -> new TimeoutMultiSplit(2,5000),
     "MSplit3" -> new TimeoutMultiSplit(3,5000),
     "MSplit4" -> new TimeoutMultiSplit(4,5000),
-    "FWS" -> FWS,
-    "BWSt" -> BWSt,
-    "BWSm" -> BWSm
+    "TDLRS" -> TopDownLeftRightSubsumption,
+    "BURLSt" -> BottomUpRightLeftSubsumptionTime,
+    "BURLSm" -> BottomUpRightLeftSubsumptionMemory
   )
 }