Fixed very rare bug of model being dependent on the order in the nomi…

…nal attribute mapping.
adaa-polsl · Mar 25, 2024 · 1636f2b · 1636f2b
1 parent 1f93637
commit 1636f2b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/adaa.analytics.rules/build.gradle b/adaa.analytics.rules/build.gradle
@@ -27,7 +27,7 @@ codeQuality {
 }
 
 sourceCompatibility = 1.8
-version = '1.7.6'
+version = '1.7.7'
 
 
 jar {

diff --git a/...lytics.rules/src/main/java/adaa/analytics/rules/logic/induction/ClassificationFinder.java b/...lytics.rules/src/main/java/adaa/analytics/rules/logic/induction/ClassificationFinder.java
@@ -684,7 +684,7 @@ class TotalPosNeg {
 								quality = modifier.modifyQuality(quality, attr.getName(), p, toCover_p);
 								// prefer (gender = female) over (gender = !male) for boolean attributes
 								if (quality > best.quality ||
-										(quality == best.quality && (p > best.covered || best.opposite))) {
+										(quality == best.quality && (p > best.covered || (p == best.covered && best.opposite)))) {
 									ElementaryCondition candidate =
 											new ElementaryCondition(attr.getName(), new SingletonSet((double) i, attr.getMapping().getValues()));
 									if (checkCandidate(candidate, classId, p, n, toCover_p, P, uncoveredPositives.size(), rule.getRuleOrderNum())) {
@@ -741,7 +741,8 @@ class TotalPosNeg {
 			for (Future f : futures) {
 				ConditionEvaluation eval = (ConditionEvaluation)f.get();
 
-				Logger.log("\tAttribute best: " + eval.condition + ", quality=" + eval.quality + "\n", Level.FINEST);
+				Logger.log("\tAttribute best: " + eval.condition + ", quality=" + eval.quality
+						+ ", p=" + eval.covered + "\n", Level.FINEST);
 
 				if (best == null || eval.quality > best.quality || (eval.quality == best.quality && eval.covered > best.covered)) {
 					best = eval;
@@ -755,7 +756,8 @@ class TotalPosNeg {
 		if (best.condition != null) {
 			Attribute bestAttr = trainSet.getAttributes().get(((ElementaryCondition)best.condition).getAttribute());
 
-			Logger.log("\tFinal best: " + best.condition + ", quality=" + best.quality + "\n", Level.FINEST);
+			Logger.log("\tFinal best: " + best.condition + ", quality=" + best.quality
+					+ ", p=" + best.covered + "\n", Level.FINEST);
 
 			if (bestAttr.isNominal()) {
 				allowedAttributes.remove(bestAttr);
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,7 @@ codeQuality { @@
     }
     sourceCompatibility = 1.8
-    version = '1.7.6'
+    version = '1.7.7'
     jar {
@@ Expand Down @@