corrected test cases after introducing command proxy to inductions

wgorkaemag · agudys · commit cc9387c80caf · 2023-12-19T12:39:31.000+01:00
diff --git a/adaa.analytics.rules/build.gradle b/adaa.analytics.rules/build.gradle
@@ -27,7 +27,7 @@ codeQuality {
 }
 
 sourceCompatibility = 1.8
-version = '1.6.0'
+version = '1.6.1'
 
 
 jar {
diff --git a/adaa.analytics.rules/test/adaa/analytics/rules/logic/induction/ClassificationExpertSnCTest.java b/adaa.analytics.rules/test/adaa/analytics/rules/logic/induction/ClassificationExpertSnCTest.java
@@ -1,6 +1,7 @@
 package adaa.analytics.rules.logic.induction;
 
 import adaa.analytics.rules.logic.representation.RuleSetBase;
+import adaa.analytics.rules.operator.OperatorCommandProxy;
 import com.rapidminer.operator.OperatorCreationException;
 import com.rapidminer.operator.OperatorException;
 import org.junit.experimental.theories.DataPoints;
@@ -61,6 +62,7 @@ private void writeReport(TestCase testCase, RuleSetBase ruleSet) {
     public void runTestCase(@FromDataPoints("Test cases") TestCase testCase) throws OperatorException, OperatorCreationException, IOException {
         ClassificationExpertFinder finder = new ClassificationExpertFinder(testCase.getParameters(), testCase.getKnowledge());
         ClassificationExpertSnC snc = new ClassificationExpertSnC(finder, testCase.getParameters(), testCase.getKnowledge());
+        snc.setOperatorCommandProxy(new OperatorCommandProxy());
         RuleSetBase ruleSet = snc.run(testCase.getExampleSet());
 
         this.writeReport(testCase, ruleSet);
diff --git a/adaa.analytics.rules/test/adaa/analytics/rules/logic/induction/ClassificationSnCTest.java b/adaa.analytics.rules/test/adaa/analytics/rules/logic/induction/ClassificationSnCTest.java
@@ -1,6 +1,7 @@
 package adaa.analytics.rules.logic.induction;
 
 import adaa.analytics.rules.logic.representation.RuleSetBase;
+import adaa.analytics.rules.operator.OperatorCommandProxy;
 import com.rapidminer.example.Attribute;
 import com.rapidminer.example.Example;
 import com.rapidminer.example.ExampleSet;
@@ -79,6 +80,7 @@ private void test_confidence(ExampleSet prediction) {
     public void runTestCase(@FromDataPoints("Test cases") TestCase testCase) throws OperatorException, OperatorCreationException, IOException {
         ClassificationFinder finder = new ClassificationFinder(testCase.getParameters());
         ClassificationSnC snc = new ClassificationSnC(finder, testCase.getParameters());
+        snc.setOperatorCommandProxy(new OperatorCommandProxy());
         RuleSetBase ruleSet = snc.run(testCase.getExampleSet());
 
         ExampleSet prediction = ruleSet.apply(testCase.getExampleSet());
diff --git a/adaa.analytics.rules/test/adaa/analytics/rules/logic/induction/RegressionActionSnCTest.java b/adaa.analytics.rules/test/adaa/analytics/rules/logic/induction/RegressionActionSnCTest.java
@@ -2,6 +2,7 @@
 
 import adaa.analytics.rules.logic.quality.ClassificationMeasure;
 import adaa.analytics.rules.logic.representation.*;
+import adaa.analytics.rules.operator.OperatorCommandProxy;
 import com.rapidminer.operator.OperatorCreationException;
 import com.rapidminer.operator.OperatorException;
 import org.junit.experimental.theories.DataPoints;
@@ -75,10 +76,12 @@ public void runTestCase(@FromDataPoints("Test cases") TestCase testCase) throws
 
         RegressionFinder regressionFinder = new RegressionFinder(params);
         RegressionSnC regressionSnC = new RegressionSnC(regressionFinder, params);
+        regressionSnC.setOperatorCommandProxy(new OperatorCommandProxy());
         RuleSetBase regressionRuleSet = regressionSnC.run(testCase.getExampleSet());
 
         RegressionActionFinder finder = new RegressionActionFinder(aParams);
         RegressionActionSnC snc = new RegressionActionSnC(finder, aParams);
+        snc.setOperatorCommandProxy(new OperatorCommandProxy());
         RuleSetBase ruleSet = snc.run(testCase.getExampleSet());
 
         for (Rule rule : ruleSet.getRules()){
diff --git a/adaa.analytics.rules/test/adaa/analytics/rules/logic/induction/RegressionExpertSnCTest.java b/adaa.analytics.rules/test/adaa/analytics/rules/logic/induction/RegressionExpertSnCTest.java
@@ -1,6 +1,7 @@
 package adaa.analytics.rules.logic.induction;
 
 import adaa.analytics.rules.logic.representation.RuleSetBase;
+import adaa.analytics.rules.operator.OperatorCommandProxy;
 import com.rapidminer.operator.OperatorCreationException;
 import com.rapidminer.operator.OperatorException;
 import org.junit.experimental.theories.DataPoints;
@@ -61,6 +62,7 @@ private void writeReport(TestCase testCase, RuleSetBase ruleSet) {
     public void runTestCase(@FromDataPoints("Test cases") TestCase testCase) throws OperatorException, OperatorCreationException, IOException {
         RegressionExpertFinder finder = new RegressionExpertFinder(testCase.getParameters());
         RegressionExpertSnC snc = new RegressionExpertSnC(finder, testCase.getParameters(), testCase.getKnowledge());
+        snc.setOperatorCommandProxy(new OperatorCommandProxy());
         RuleSetBase ruleSet = snc.run(testCase.getExampleSet());
 
         this.writeReport(testCase, ruleSet);
diff --git a/adaa.analytics.rules/test/adaa/analytics/rules/logic/induction/RegressionSnCTest.java b/adaa.analytics.rules/test/adaa/analytics/rules/logic/induction/RegressionSnCTest.java
@@ -1,6 +1,7 @@
 package adaa.analytics.rules.logic.induction;
 
 import adaa.analytics.rules.logic.representation.RuleSetBase;
+import adaa.analytics.rules.operator.OperatorCommandProxy;
 import com.rapidminer.operator.OperatorCreationException;
 import com.rapidminer.operator.OperatorException;
 import org.junit.experimental.theories.DataPoints;
@@ -61,6 +62,7 @@ private void writeReport(TestCase testCase, RuleSetBase ruleSet) {
     public void runTestCase(@FromDataPoints("Test cases") TestCase testCase) throws OperatorException, OperatorCreationException, IOException {
         RegressionFinder finder = new RegressionFinder(testCase.getParameters());
         RegressionSnC snc = new RegressionSnC(finder, testCase.getParameters());
+        snc.setOperatorCommandProxy(new OperatorCommandProxy());
         RuleSetBase ruleSet = snc.run(testCase.getExampleSet());
 
         this.writeReport(testCase, ruleSet);
diff --git a/adaa.analytics.rules/test/adaa/analytics/rules/logic/induction/SurvivalLogRankExpertSnCTest.java b/adaa.analytics.rules/test/adaa/analytics/rules/logic/induction/SurvivalLogRankExpertSnCTest.java
@@ -1,6 +1,7 @@
 package adaa.analytics.rules.logic.induction;
 
 import adaa.analytics.rules.logic.representation.RuleSetBase;
+import adaa.analytics.rules.operator.OperatorCommandProxy;
 import com.rapidminer.operator.OperatorCreationException;
 import com.rapidminer.operator.OperatorException;
 import org.junit.experimental.theories.DataPoints;
@@ -61,6 +62,7 @@ private void writeReport(TestCase testCase, RuleSetBase ruleSet) {
     public void runTestCase(@FromDataPoints("Test cases") TestCase testCase) throws OperatorException, OperatorCreationException, IOException {
         SurvivalLogRankExpertFinder finder = new SurvivalLogRankExpertFinder(testCase.getParameters());
         SurvivalLogRankExpertSnC snc = new SurvivalLogRankExpertSnC(finder, testCase.getParameters(), testCase.getKnowledge());
+        snc.setOperatorCommandProxy(new OperatorCommandProxy());
         RuleSetBase ruleSet = snc.run(testCase.getExampleSet());
 
         this.writeReport(testCase, ruleSet);
diff --git a/adaa.analytics.rules/test/adaa/analytics/rules/logic/induction/SurvivalLogRankSnCTest.java b/adaa.analytics.rules/test/adaa/analytics/rules/logic/induction/SurvivalLogRankSnCTest.java
@@ -1,6 +1,7 @@
 package adaa.analytics.rules.logic.induction;
 
 import adaa.analytics.rules.logic.representation.RuleSetBase;
+import adaa.analytics.rules.operator.OperatorCommandProxy;
 import com.rapidminer.operator.OperatorCreationException;
 import com.rapidminer.operator.OperatorException;
 import org.junit.experimental.theories.DataPoints;
@@ -61,6 +62,7 @@ private void writeReport(TestCase testCase, RuleSetBase ruleSet) {
     public void runTestCase(@FromDataPoints("Test cases") TestCase testCase) throws OperatorException, OperatorCreationException, IOException {
         SurvivalLogRankFinder finder = new SurvivalLogRankFinder(testCase.getParameters());
         SurvivalLogRankSnC snc = new SurvivalLogRankSnC(finder, testCase.getParameters());
+        snc.setOperatorCommandProxy(new OperatorCommandProxy());
         RuleSetBase ruleSet = snc.run(testCase.getExampleSet());
 
         this.writeReport(testCase, ruleSet);

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ codeQuality {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`sourceCompatibility = 1.8`
`30`		`-version = '1.6.0'`
	`30`	`+version = '1.6.1'`
`31`	`31`
`32`	`32`
`33`	`33`	`jar {`