Skip to content

Commit 2aead57

Browse files
committed
simplified assertions
1 parent b384174 commit 2aead57

File tree

9 files changed

+7
-12
lines changed

9 files changed

+7
-12
lines changed

common/core/src/test/java/zingg/common/core/executor/blockingverifier/TestVerifyBlocking.java

+3-8
Original file line numberDiff line numberDiff line change
@@ -82,17 +82,12 @@ public void testGetBlockSamples() throws Exception, ZinggClientException{
8282
ZFrame<D, R, C> df1 = context.getPipeUtil().read(false, false, verifyBlockingPipes.getBlockSamplesPipe(arguments, ColName.BLOCK_SAMPLES + "3915"));
8383
ZFrame<D, R, C> df2 = context.getPipeUtil().read(false, false, verifyBlockingPipes.getBlockSamplesPipe(arguments, getMassagedTableName("-3910")));
8484

85-
assertTrue(df1.count() == 3L);
86-
assertTrue(df2.count() == 1L);
85+
assertEquals(3L, df1.count());
86+
assertEquals(1L, df2.count());
8787
}
8888

8989
public boolean checkNoOfTopBlocks(ZFrame<D,R,C> blockTopRec){
90-
if(blockTopRec.count() == 3L){
91-
return true;
92-
}
93-
else{
94-
return false;
95-
}
90+
return blockTopRec.count() == 3L;
9691
}
9792

9893
public abstract String getMassagedTableName(String hash);
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"class":"org.apache.spark.ml.PipelineModel","timestamp":1741053494094,"sparkVersion":"3.5.0","uid":"pipeline_96275022e325","paramMap":{"stageUids":["vecAssembler_653cf139eaf2","poly_e8337b2be484","logreg_fb73f0ae6c76"]},"defaultParamMap":{}}
1+
{"class":"org.apache.spark.ml.PipelineModel","timestamp":1741125425419,"sparkVersion":"3.5.0","uid":"pipeline_d56c08a71233","paramMap":{"stageUids":["vecAssembler_169282bd6cdf","poly_1e9983ba1360","logreg_4e6b8ca21577"]},"defaultParamMap":{}}
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"class":"org.apache.spark.ml.Pipeline","timestamp":1741053493860,"sparkVersion":"3.5.0","uid":"pipeline_96275022e325","paramMap":{"stageUids":["vecAssembler_653cf139eaf2","poly_e8337b2be484","logreg_fb73f0ae6c76"]},"defaultParamMap":{}}
1+
{"class":"org.apache.spark.ml.Pipeline","timestamp":1741125425219,"sparkVersion":"3.5.0","uid":"pipeline_d56c08a71233","paramMap":{"stageUids":["vecAssembler_169282bd6cdf","poly_1e9983ba1360","logreg_4e6b8ca21577"]},"defaultParamMap":{}}
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"class":"org.apache.spark.ml.evaluation.BinaryClassificationEvaluator","timestamp":1741053493795,"sparkVersion":"3.5.0","uid":"binEval_682719b7b8c6","paramMap":{"labelCol":"z_isMatch"},"defaultParamMap":{"metricName":"areaUnderROC","numBins":1000,"labelCol":"label","rawPredictionCol":"rawPrediction"}}
1+
{"class":"org.apache.spark.ml.evaluation.BinaryClassificationEvaluator","timestamp":1741125425163,"sparkVersion":"3.5.0","uid":"binEval_6b2720eecec8","paramMap":{"labelCol":"z_isMatch"},"defaultParamMap":{"labelCol":"label","metricName":"areaUnderROC","numBins":1000,"rawPredictionCol":"rawPrediction"}}
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"class":"org.apache.spark.ml.tuning.CrossValidatorModel","timestamp":1741053493692,"sparkVersion":"3.5.0","uid":"cv_b57583ddb99f","paramMap":{"numFolds":2,"foldCol":"","seed":-1191137437,"estimatorParamMaps":[[{"parent":"logreg_fb73f0ae6c76","name":"regParam","value":"1.0E-4","isJson":"true"},{"parent":"logreg_fb73f0ae6c76","name":"threshold","value":"0.4","isJson":"true"}],[{"parent":"logreg_fb73f0ae6c76","name":"regParam","value":"0.001","isJson":"true"},{"parent":"logreg_fb73f0ae6c76","name":"threshold","value":"0.4","isJson":"true"}],[{"parent":"logreg_fb73f0ae6c76","name":"regParam","value":"0.01","isJson":"true"},{"parent":"logreg_fb73f0ae6c76","name":"threshold","value":"0.4","isJson":"true"}],[{"parent":"logreg_fb73f0ae6c76","name":"regParam","value":"0.1","isJson":"true"},{"parent":"logreg_fb73f0ae6c76","name":"threshold","value":"0.4","isJson":"true"}],[{"parent":"logreg_fb73f0ae6c76","name":"regParam","value":"1.0","isJson":"true"},{"parent":"logreg_fb73f0ae6c76","name":"threshold","value":"0.4","isJson":"true"}],[{"parent":"logreg_fb73f0ae6c76","name":"regParam","value":"1.0E-4","isJson":"true"},{"parent":"logreg_fb73f0ae6c76","name":"threshold","value":"0.45","isJson":"true"}],[{"parent":"logreg_fb73f0ae6c76","name":"regParam","value":"0.001","isJson":"true"},{"parent":"logreg_fb73f0ae6c76","name":"threshold","value":"0.45","isJson":"true"}],[{"parent":"logreg_fb73f0ae6c76","name":"regParam","value":"0.01","isJson":"true"},{"parent":"logreg_fb73f0ae6c76","name":"threshold","value":"0.45","isJson":"true"}],[{"parent":"logreg_fb73f0ae6c76","name":"regParam","value":"0.1","isJson":"true"},{"parent":"logreg_fb73f0ae6c76","name":"threshold","value":"0.45","isJson":"true"}],[{"parent":"logreg_fb73f0ae6c76","name":"regParam","value":"1.0","isJson":"true"},{"parent":"logreg_fb73f0ae6c76","name":"threshold","value":"0.45","isJson":"true"}],[{"parent":"logreg_fb73f0ae6c76","name":"regParam","value":"1.0E-4","isJson":"true"},{"parent":"logreg_fb73f0ae6c76","name":"threshold","value":"0.5","isJson":"true"}],[{"parent":"logreg_fb73f0ae6c76","name":"regParam","value":"0.001","isJson":"true"},{"parent":"logreg_fb73f0ae6c76","name":"threshold","value":"0.5","isJson":"true"}],[{"parent":"logreg_fb73f0ae6c76","name":"regParam","value":"0.01","isJson":"true"},{"parent":"logreg_fb73f0ae6c76","name":"threshold","value":"0.5","isJson":"true"}],[{"parent":"logreg_fb73f0ae6c76","name":"regParam","value":"0.1","isJson":"true"},{"parent":"logreg_fb73f0ae6c76","name":"threshold","value":"0.5","isJson":"true"}],[{"parent":"logreg_fb73f0ae6c76","name":"regParam","value":"1.0","isJson":"true"},{"parent":"logreg_fb73f0ae6c76","name":"threshold","value":"0.5","isJson":"true"}],[{"parent":"logreg_fb73f0ae6c76","name":"regParam","value":"1.0E-4","isJson":"true"},{"parent":"logreg_fb73f0ae6c76","name":"threshold","value":"0.55","isJson":"true"}],[{"parent":"logreg_fb73f0ae6c76","name":"regParam","value":"0.001","isJson":"true"},{"parent":"logreg_fb73f0ae6c76","name":"threshold","value":"0.55","isJson":"true"}],[{"parent":"logreg_fb73f0ae6c76","name":"regParam","value":"0.01","isJson":"true"},{"parent":"logreg_fb73f0ae6c76","name":"threshold","value":"0.55","isJson":"true"}],[{"parent":"logreg_fb73f0ae6c76","name":"regParam","value":"0.1","isJson":"true"},{"parent":"logreg_fb73f0ae6c76","name":"threshold","value":"0.55","isJson":"true"}],[{"parent":"logreg_fb73f0ae6c76","name":"regParam","value":"1.0","isJson":"true"},{"parent":"logreg_fb73f0ae6c76","name":"threshold","value":"0.55","isJson":"true"}]]},"defaultParamMap":{"numFolds":3,"foldCol":"","seed":-1191137437},"avgMetrics":[1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0],"persistSubModels":false}
1+
{"class":"org.apache.spark.ml.tuning.CrossValidatorModel","timestamp":1741125425079,"sparkVersion":"3.5.0","uid":"cv_0378a460475a","paramMap":{"foldCol":"","seed":-1191137437,"numFolds":2,"estimatorParamMaps":[[{"parent":"logreg_4e6b8ca21577","name":"regParam","value":"1.0E-4","isJson":"true"},{"parent":"logreg_4e6b8ca21577","name":"threshold","value":"0.4","isJson":"true"}],[{"parent":"logreg_4e6b8ca21577","name":"regParam","value":"0.001","isJson":"true"},{"parent":"logreg_4e6b8ca21577","name":"threshold","value":"0.4","isJson":"true"}],[{"parent":"logreg_4e6b8ca21577","name":"regParam","value":"0.01","isJson":"true"},{"parent":"logreg_4e6b8ca21577","name":"threshold","value":"0.4","isJson":"true"}],[{"parent":"logreg_4e6b8ca21577","name":"regParam","value":"0.1","isJson":"true"},{"parent":"logreg_4e6b8ca21577","name":"threshold","value":"0.4","isJson":"true"}],[{"parent":"logreg_4e6b8ca21577","name":"regParam","value":"1.0","isJson":"true"},{"parent":"logreg_4e6b8ca21577","name":"threshold","value":"0.4","isJson":"true"}],[{"parent":"logreg_4e6b8ca21577","name":"regParam","value":"1.0E-4","isJson":"true"},{"parent":"logreg_4e6b8ca21577","name":"threshold","value":"0.45","isJson":"true"}],[{"parent":"logreg_4e6b8ca21577","name":"regParam","value":"0.001","isJson":"true"},{"parent":"logreg_4e6b8ca21577","name":"threshold","value":"0.45","isJson":"true"}],[{"parent":"logreg_4e6b8ca21577","name":"regParam","value":"0.01","isJson":"true"},{"parent":"logreg_4e6b8ca21577","name":"threshold","value":"0.45","isJson":"true"}],[{"parent":"logreg_4e6b8ca21577","name":"regParam","value":"0.1","isJson":"true"},{"parent":"logreg_4e6b8ca21577","name":"threshold","value":"0.45","isJson":"true"}],[{"parent":"logreg_4e6b8ca21577","name":"regParam","value":"1.0","isJson":"true"},{"parent":"logreg_4e6b8ca21577","name":"threshold","value":"0.45","isJson":"true"}],[{"parent":"logreg_4e6b8ca21577","name":"regParam","value":"1.0E-4","isJson":"true"},{"parent":"logreg_4e6b8ca21577","name":"threshold","value":"0.5","isJson":"true"}],[{"parent":"logreg_4e6b8ca21577","name":"regParam","value":"0.001","isJson":"true"},{"parent":"logreg_4e6b8ca21577","name":"threshold","value":"0.5","isJson":"true"}],[{"parent":"logreg_4e6b8ca21577","name":"regParam","value":"0.01","isJson":"true"},{"parent":"logreg_4e6b8ca21577","name":"threshold","value":"0.5","isJson":"true"}],[{"parent":"logreg_4e6b8ca21577","name":"regParam","value":"0.1","isJson":"true"},{"parent":"logreg_4e6b8ca21577","name":"threshold","value":"0.5","isJson":"true"}],[{"parent":"logreg_4e6b8ca21577","name":"regParam","value":"1.0","isJson":"true"},{"parent":"logreg_4e6b8ca21577","name":"threshold","value":"0.5","isJson":"true"}],[{"parent":"logreg_4e6b8ca21577","name":"regParam","value":"1.0E-4","isJson":"true"},{"parent":"logreg_4e6b8ca21577","name":"threshold","value":"0.55","isJson":"true"}],[{"parent":"logreg_4e6b8ca21577","name":"regParam","value":"0.001","isJson":"true"},{"parent":"logreg_4e6b8ca21577","name":"threshold","value":"0.55","isJson":"true"}],[{"parent":"logreg_4e6b8ca21577","name":"regParam","value":"0.01","isJson":"true"},{"parent":"logreg_4e6b8ca21577","name":"threshold","value":"0.55","isJson":"true"}],[{"parent":"logreg_4e6b8ca21577","name":"regParam","value":"0.1","isJson":"true"},{"parent":"logreg_4e6b8ca21577","name":"threshold","value":"0.55","isJson":"true"}],[{"parent":"logreg_4e6b8ca21577","name":"regParam","value":"1.0","isJson":"true"},{"parent":"logreg_4e6b8ca21577","name":"threshold","value":"0.55","isJson":"true"}]]},"defaultParamMap":{"foldCol":"","seed":-1191137437,"numFolds":3},"avgMetrics":[1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0],"persistSubModels":false}

0 commit comments

Comments
 (0)