Merge branch 'develop' of https://github.com/adaa-polsl/RuleKit-dev i…

…nto develop
adaa-polsl · Apr 5, 2024 · 0a22c07 · 0a22c07
2 parents a2de3da + ca0c47c
commit 0a22c07
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4 deletions.
diff --git a/adaa.analytics.rules/src/main/java/adaa/analytics/rules/logic/induction/AbstractFinder.java b/adaa.analytics.rules/src/main/java/adaa/analytics/rules/logic/induction/AbstractFinder.java
@@ -350,8 +350,8 @@ protected Set<Attribute> names2attributes(Set<String> names, ExampleSet dataset)
 		return out;
 	}
 
-		double countAbsoluteMinimumCovered(double size, int ruleOrderNum, double uncoveredSize) {
-		if (params.getMaxRuleCount()>1 && ruleOrderNum>-1) {
+	double countAbsoluteMinimumCovered(double size, int ruleOrderNum, double uncoveredSize) {
+		if (params.getMaxRuleCount()>0 && ruleOrderNum>-1) {
 			double sizeToCover = uncoveredSize * (1.0 - params.getMaximumUncoveredFraction());
 			int toGenerateRulesCount = params.getMaxRuleCount()- ruleOrderNum;
 			double fractionCurrentGeneration = 1.0 / (double) toGenerateRulesCount;

diff --git a/...analytics.rules/src/main/java/adaa/analytics/rules/logic/induction/ClassificationSnC.java b/...analytics.rules/src/main/java/adaa/analytics/rules/logic/induction/ClassificationSnC.java
@@ -138,7 +138,7 @@ public RuleSetBase run(ExampleSet dataset) {
 				rule.setCoveredNegatives(new IntegerBitSet(dataset.size()));
 				rule.getCoveredPositives().addAll(positives);
 				rule.getCoveredNegatives().addAll(negatives);
-				rule.setRuleOrderNum(ruleset.getRules().size());
+				rule.setRuleOrderNum(countRuleOrderNumber(ruleset,label));
 
 				rule.getConsequence().setCovering(positives);
 
@@ -201,4 +201,20 @@ public RuleSetBase run(ExampleSet dataset) {
 	public void preprocessClass(ExampleSet dataset, int classId) {
 
 	}
+
+	int countRuleOrderNumber(ClassificationRuleSet ruleSet, String currentClassLabel)
+	{
+		int counter = 0;
+
+		for(Rule r: ruleSet.getRules())
+		{
+			ClassificationRule cr = (ClassificationRule)r;
+			if (cr.getClassLabel().equals(currentClassLabel))
+			{
+				counter++;
+			}
+		}
+
+		return counter;
+	}
 }
diff --git a/...ics.rules/src/main/java/adaa/analytics/rules/logic/representation/ClassificationRule.java b/...ics.rules/src/main/java/adaa/analytics/rules/logic/representation/ClassificationRule.java
@@ -38,6 +38,10 @@ public class ClassificationRule extends Rule {
 	/** Serialization identifier. */
 	private static final long serialVersionUID = -809625670611500594L;
 
+	public String getClassLabel() {
+		SingletonSet ss = (SingletonSet)getConsequence().getValueSet();
+		return ss.getValueAsString();
+	}
 	/**
 	 * Creates empty classification rule.
 	 */

diff --git a/...analytics.rules/src/main/java/adaa/analytics/rules/logic/representation/SingletonSet.java b/...analytics.rules/src/main/java/adaa/analytics/rules/logic/representation/SingletonSet.java
@@ -41,7 +41,10 @@ public class SingletonSet implements IValueSet, Serializable {
 	public double getValue() { return value; }
 	/** Sets {@link #value} */
 	public void setValue(double v) { value = v; }
-
+
+	/** Gets {@link #value} as string */
+	public String getValueAsString() { return mapping.get((int)value); }
+
 	/** Gets {@link #mapping} */
 	public List<String> getMapping() { return mapping; }
 	/** Sets {@link #mapping} */