refactor init to base class

zinggAI · Feb 18, 2024 · 6423793 · 6423793
1 parent e18399e
commit 6423793
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/common/common-test/src/test/java/zingg/common/core/executor/MatcherTester.java b/common/common-test/src/test/java/zingg/common/core/executor/MatcherTester.java
@@ -53,8 +53,8 @@ protected void assessAccuracy() throws ZinggClientException {
 		LOG.info("precision " + (tpCount*1.0d/(tpCount+fpCount)));
 		LOG.info("recall " + tpCount + " denom " + (tpCount+fnCount) + " overall " + (tpCount*1.0d/(tpCount+fnCount)));
 
-		assertTrue(0.8 < (tpCount*1.0d/(tpCount+fpCount)));
-		assertTrue(0.8 < (tpCount*1.0d/(tpCount+fnCount)));
+		assertTrue(0.8 < Math.round(tpCount*1.0d/(tpCount+fpCount)));
+		assertTrue(0.8 < Math.round(tpCount*1.0d/(tpCount+fnCount)));
 	}
 
 	public ZFrame<D, R, C> getOutputData() throws ZinggClientException {

diff --git a/common/common-test/src/test/java/zingg/common/core/executor/TestExecutorsGeneric.java b/common/common-test/src/test/java/zingg/common/core/executor/TestExecutorsGeneric.java
@@ -49,23 +49,35 @@ public String setupArgs() throws ZinggClientException, IOException {
 	public void testExecutors() throws ZinggClientException {	
 		List<ExecutorTester<S, D, R, C, T>> executorTesterList = new ArrayList<ExecutorTester<S, D, R, C, T>>();
 
-		TrainingDataFinderTester<S, D, R, C, T> tdft = new TrainingDataFinderTester<S, D, R, C, T>(getTrainingDataFinder());
+		TrainingDataFinder<S, D, R, C, T> trainingDataFinder = getTrainingDataFinder();
+		trainingDataFinder.init(args);
+		TrainingDataFinderTester<S, D, R, C, T> tdft = new TrainingDataFinderTester<S, D, R, C, T>(trainingDataFinder);
 		executorTesterList.add(tdft);
 
-		LabellerTester<S, D, R, C, T> lt = new LabellerTester<S, D, R, C, T>(getLabeller());
+		Labeller<S, D, R, C, T> labeller = getLabeller();
+		labeller.init(args);
+		LabellerTester<S, D, R, C, T> lt = new LabellerTester<S, D, R, C, T>(labeller);
 		executorTesterList.add(lt);
 
 		// training and labelling needed twice to get sufficient data
-		TrainingDataFinderTester<S, D, R, C, T> tdft2 = new TrainingDataFinderTester<S, D, R, C, T>(getTrainingDataFinder());
+		TrainingDataFinder<S, D, R, C, T> trainingDataFinder2 = getTrainingDataFinder();
+		trainingDataFinder2.init(args);
+		TrainingDataFinderTester<S, D, R, C, T> tdft2 = new TrainingDataFinderTester<S, D, R, C, T>(trainingDataFinder2);
 		executorTesterList.add(tdft2);
 
-		LabellerTester<S, D, R, C, T> lt2 = new LabellerTester<S, D, R, C, T>(getLabeller());
+		Labeller<S, D, R, C, T> labeller2 = getLabeller();
+		labeller2.init(args);
+		LabellerTester<S, D, R, C, T> lt2 = new LabellerTester<S, D, R, C, T>(labeller2);
 		executorTesterList.add(lt2);
 
-		TrainerTester<S, D, R, C, T> tt = new TrainerTester<S, D, R, C, T>(getTrainer());
+		Trainer<S, D, R, C, T> trainer = getTrainer();
+		trainer.init(args);
+		TrainerTester<S, D, R, C, T> tt = new TrainerTester<S, D, R, C, T>(trainer);
 		executorTesterList.add(tt);
 
-		MatcherTester<S, D, R, C, T> mt = new MatcherTester(getMatcher());
+		Matcher<S, D, R, C, T> matcher = getMatcher();
+		matcher.init(args);
+		MatcherTester<S, D, R, C, T> mt = new MatcherTester(matcher);
 		executorTesterList.add(mt);
 
 		testExecutors(executorTesterList);

diff --git a/spark/spark-test/src/test/java/zingg/spark/core/executor/TestSparkExecutors.java b/spark/spark-test/src/test/java/zingg/spark/core/executor/TestSparkExecutors.java
@@ -47,25 +47,21 @@ public String getConfigFile() {
 	@Override
 	protected SparkTrainingDataFinder getTrainingDataFinder() throws ZinggClientException {
 		SparkTrainingDataFinder stdf = new SparkTrainingDataFinder(ctx);
-		stdf.init(args);
 		return stdf;
 	}
 	@Override
 	protected Labeller<SparkSession,Dataset<Row>,Row,Column,DataType> getLabeller() throws ZinggClientException {
 		JunitSparkLabeller jlbl = new JunitSparkLabeller(ctx);
-		jlbl.init(args);
 		return jlbl;
 	}
 	@Override
 	protected SparkTrainer getTrainer() throws ZinggClientException {
 		SparkTrainer st = new SparkTrainer(ctx);
-		st.init(args);
 		return st;
 	}
 	@Override
 	protected SparkMatcher getMatcher() throws ZinggClientException {
 		SparkMatcher sm = new SparkMatcher(ctx);
-		sm.init(args);
 		return sm;
 	}