Merge branch 'develop' into snapshot_version

Author: swissiety

boomerangScope-Opal/src/main/scala/boomerang/scope/opal/tac/OpalVal.scala

@@ -169,5 +169,5 @@ class OpalVal(
     case _ => false
   }
 
-  override def toString: String = getVariableName
+  override def toString: String = s"$getVariableName + ${if (isUnbalanced) " unbalanced " + unbalancedStmt}"
 }

boomerangScope-Soot/src/main/java/boomerang/scope/soot/jimple/JimpleVal.java

@@ -267,10 +267,6 @@ public int hashCode() {
 
   @Override
   public String toString() {
-    return delegate.toString()
-        + " ("
-        + m
-        + ")"
-        + (isUnbalanced() ? " unbalanced " + unbalancedStmt : "");
+    return delegate.toString() + (isUnbalanced() ? " unbalanced " + unbalancedStmt : "");
   }
 }

idealPDS/src/main/java/typestate/TransitionFunction.java

@@ -25,8 +25,4 @@ public interface TransitionFunction extends Weight {
   @NonNull Collection<Transition> getValues();
 
   @NonNull Set<ControlFlowGraph.Edge> getStateChangeStatements();
-
-  @NonNull Weight extendWith(@NonNull Weight other);
-
-  @NonNull Weight combineWith(@NonNull Weight other);
 }