Fixed some bugs that made the solver incorrect.

org.sat4j.csp/src/main/java/org/sat4j/csp/constraints3/CountingCtrBuilder.java

@@ -68,7 +68,9 @@ public class CountingCtrBuilder {
 			exprBuf.append(',');
 		}
 		varId = list[list.length-1].id;
-		exprBuf.append(CtrBuilderUtils.normalizeCspVarName(varId));
+		final int lastCoeff = coeffs[list.length-1];
+		final String normName = CtrBuilderUtils.normalizeCspVarName(varId);
+		exprBuf.append(lastCoeff == 1 ? normName : "mul("+lastCoeff+","+normName+")");
 		for(int i=0; i<list.length-1; ++i) {
 			exprBuf.append(')');
 		}

org.sat4j.csp/src/main/java/org/sat4j/csp/intension/TseitinBasedIntensionCtrEncoder.java

@@ -387,7 +387,7 @@ public class TseitinBasedIntensionCtrEncoder implements IIntensionCtrEncoder {
 			Iterator<Entry<Integer, Integer>> it2 = mappings.get(1).entrySet().iterator();
 			while(it2.hasNext()) {
 				Entry<Integer, Integer> entry2 = it2.next();
-				buildImplVar(ret, entry1.getValue(), entry2.getValue(), entry1.getKey()==entry2.getKey()?1:0);
+				buildImplVar(ret, entry1.getValue(), entry2.getValue(), entry1.getKey().equals(entry2.getKey())?1:0);
 			}
 		}
 		return ret;