Skip to content

Commit

Permalink
ZFrame constants cleanup (#1019)
Browse files Browse the repository at this point in the history
* model104 with z_zsource correction

* Update ZFrame.java

* Update ZFrame.java

---------

Co-authored-by: nitish <[email protected]>
  • Loading branch information
Arjun-Zingg and Nitish1814 authored Jan 29, 2025
1 parent 5e90d2b commit 049985d
Show file tree
Hide file tree
Showing 1,157 changed files with 10 additions and 15 deletions.
5 changes: 0 additions & 5 deletions common/client/src/main/java/zingg/common/client/ZFrame.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,7 @@ public interface ZFrame<D, R, C> {
public static final String LEFT_JOIN = "left";

public static final String COL_COUNT = "count";
public static final String COL_VALUE = "VALUE";

public static String PIVOT_COLUMN = "field";
public static String VALUE_1 = "value1";
public static String VALUE_2 = "value2";
public static String ORDER = "order";

public ZFrame<D, R, C> cache();
public ZFrame<D, R, C> as(String s);
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"class":"org.apache.spark.ml.PipelineModel","timestamp":1680273559856,"sparkVersion":"3.1.2","uid":"pipeline_7b7cf22a434d","paramMap":{"stageUids":["vecAssembler_ff75a98fdd66","poly_bb9a8037ef3c","logreg_e969b654a565"]},"defaultParamMap":{}}
{"class":"org.apache.spark.ml.PipelineModel","timestamp":1737492025563,"sparkVersion":"3.5.3","uid":"pipeline_e719539fb02f","paramMap":{"stageUids":["vecAssembler_38f5a1ba9b37","poly_189cac166d43","logreg_cb0318836c4e"]},"defaultParamMap":{}}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"class":"org.apache.spark.ml.feature.VectorAssembler","timestamp":1737492025599,"sparkVersion":"3.5.3","uid":"vecAssembler_38f5a1ba9b37","paramMap":{"outputCol":"z_featurevector","inputCols":["z_sim0","z_sim1","z_sim2","z_sim3","z_sim4","z_sim5"]},"defaultParamMap":{"outputCol":"vecAssembler_38f5a1ba9b37__output","handleInvalid":"error"}}
Binary file not shown.

This file was deleted.

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"class":"org.apache.spark.ml.feature.PolynomialExpansion","timestamp":1737492025636,"sparkVersion":"3.5.3","uid":"poly_189cac166d43","paramMap":{"degree":3,"outputCol":"z_feature","inputCol":"z_featurevector"},"defaultParamMap":{"degree":2,"outputCol":"poly_189cac166d43__output"}}
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"class":"org.apache.spark.ml.classification.LogisticRegressionModel","timestamp":1737492025670,"sparkVersion":"3.5.3","uid":"logreg_cb0318836c4e","paramMap":{"featuresCol":"z_feature","labelCol":"z_isMatch","regParam":1.0,"probabilityCol":"z_probability","fitIntercept":true,"threshold":0.4,"predictionCol":"z_prediction","maxIter":100},"defaultParamMap":{"featuresCol":"features","rawPredictionCol":"rawPrediction","maxBlockSizeInMB":0.0,"aggregationDepth":2,"family":"auto","labelCol":"label","standardization":true,"regParam":0.0,"elasticNetParam":0.0,"tol":1.0E-6,"probabilityCol":"probability","fitIntercept":true,"predictionCol":"prediction","threshold":0.5,"maxIter":100}}
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"class":"org.apache.spark.ml.Pipeline","timestamp":1680273559286,"sparkVersion":"3.1.2","uid":"pipeline_7b7cf22a434d","paramMap":{"stageUids":["vecAssembler_ff75a98fdd66","poly_bb9a8037ef3c","logreg_e969b654a565"]},"defaultParamMap":{}}
{"class":"org.apache.spark.ml.Pipeline","timestamp":1737492025401,"sparkVersion":"3.5.3","uid":"pipeline_e719539fb02f","paramMap":{"stageUids":["vecAssembler_38f5a1ba9b37","poly_189cac166d43","logreg_cb0318836c4e"]},"defaultParamMap":{}}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"class":"org.apache.spark.ml.feature.VectorAssembler","timestamp":1737492025454,"sparkVersion":"3.5.3","uid":"vecAssembler_38f5a1ba9b37","paramMap":{"outputCol":"z_featurevector","inputCols":["z_sim0","z_sim1","z_sim2","z_sim3","z_sim4","z_sim5"]},"defaultParamMap":{"outputCol":"vecAssembler_38f5a1ba9b37__output","handleInvalid":"error"}}
Binary file not shown.

This file was deleted.

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"class":"org.apache.spark.ml.feature.PolynomialExpansion","timestamp":1737492025494,"sparkVersion":"3.5.3","uid":"poly_189cac166d43","paramMap":{"degree":3,"outputCol":"z_feature","inputCol":"z_featurevector"},"defaultParamMap":{"degree":2,"outputCol":"poly_189cac166d43__output"}}
Binary file not shown.

This file was deleted.

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"class":"org.apache.spark.ml.classification.LogisticRegression","timestamp":1737492025529,"sparkVersion":"3.5.3","uid":"logreg_cb0318836c4e","paramMap":{"featuresCol":"z_feature","labelCol":"z_isMatch","probabilityCol":"z_probability","fitIntercept":true,"predictionCol":"z_prediction","maxIter":100},"defaultParamMap":{"featuresCol":"features","rawPredictionCol":"rawPrediction","maxBlockSizeInMB":0.0,"aggregationDepth":2,"family":"auto","labelCol":"label","standardization":true,"regParam":0.0,"elasticNetParam":0.0,"tol":1.0E-6,"probabilityCol":"probability","fitIntercept":true,"predictionCol":"prediction","threshold":0.5,"maxIter":100}}
Binary file not shown.

This file was deleted.

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"class":"org.apache.spark.ml.evaluation.BinaryClassificationEvaluator","timestamp":1680273559105,"sparkVersion":"3.1.2","uid":"binEval_7e34ba5b976c","paramMap":{"labelCol":"z_isMatch"},"defaultParamMap":{"labelCol":"label","rawPredictionCol":"rawPrediction","numBins":1000,"metricName":"areaUnderROC"}}
{"class":"org.apache.spark.ml.evaluation.BinaryClassificationEvaluator","timestamp":1737492025349,"sparkVersion":"3.5.3","uid":"binEval_8e23661184be","paramMap":{"labelCol":"z_isMatch"},"defaultParamMap":{"metricName":"areaUnderROC","numBins":1000,"rawPredictionCol":"rawPrediction","labelCol":"label"}}
Binary file modified models/104/model/classifier/best.model/metadata/.part-00000.crc
Binary file not shown.
2 changes: 1 addition & 1 deletion models/104/model/classifier/best.model/metadata/part-00000
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"class":"org.apache.spark.ml.tuning.CrossValidatorModel","timestamp":1680273558837,"sparkVersion":"3.1.2","uid":"cv_a067ce7197d6","paramMap":{"seed":-1191137437,"foldCol":"","numFolds":2,"estimatorParamMaps":[[{"parent":"logreg_e969b654a565","name":"threshold","value":"0.4","isJson":"true"},{"parent":"logreg_e969b654a565","name":"regParam","value":"1.0E-4","isJson":"true"}],[{"parent":"logreg_e969b654a565","name":"threshold","value":"0.45","isJson":"true"},{"parent":"logreg_e969b654a565","name":"regParam","value":"1.0E-4","isJson":"true"}],[{"parent":"logreg_e969b654a565","name":"threshold","value":"0.5","isJson":"true"},{"parent":"logreg_e969b654a565","name":"regParam","value":"1.0E-4","isJson":"true"}],[{"parent":"logreg_e969b654a565","name":"threshold","value":"0.55","isJson":"true"},{"parent":"logreg_e969b654a565","name":"regParam","value":"1.0E-4","isJson":"true"}],[{"parent":"logreg_e969b654a565","name":"threshold","value":"0.4","isJson":"true"},{"parent":"logreg_e969b654a565","name":"regParam","value":"0.001","isJson":"true"}],[{"parent":"logreg_e969b654a565","name":"threshold","value":"0.45","isJson":"true"},{"parent":"logreg_e969b654a565","name":"regParam","value":"0.001","isJson":"true"}],[{"parent":"logreg_e969b654a565","name":"threshold","value":"0.5","isJson":"true"},{"parent":"logreg_e969b654a565","name":"regParam","value":"0.001","isJson":"true"}],[{"parent":"logreg_e969b654a565","name":"threshold","value":"0.55","isJson":"true"},{"parent":"logreg_e969b654a565","name":"regParam","value":"0.001","isJson":"true"}],[{"parent":"logreg_e969b654a565","name":"threshold","value":"0.4","isJson":"true"},{"parent":"logreg_e969b654a565","name":"regParam","value":"0.01","isJson":"true"}],[{"parent":"logreg_e969b654a565","name":"threshold","value":"0.45","isJson":"true"},{"parent":"logreg_e969b654a565","name":"regParam","value":"0.01","isJson":"true"}],[{"parent":"logreg_e969b654a565","name":"threshold","value":"0.5","isJson":"true"},{"parent":"logreg_e969b654a565","name":"regParam","value":"0.01","isJson":"true"}],[{"parent":"logreg_e969b654a565","name":"threshold","value":"0.55","isJson":"true"},{"parent":"logreg_e969b654a565","name":"regParam","value":"0.01","isJson":"true"}],[{"parent":"logreg_e969b654a565","name":"threshold","value":"0.4","isJson":"true"},{"parent":"logreg_e969b654a565","name":"regParam","value":"0.1","isJson":"true"}],[{"parent":"logreg_e969b654a565","name":"threshold","value":"0.45","isJson":"true"},{"parent":"logreg_e969b654a565","name":"regParam","value":"0.1","isJson":"true"}],[{"parent":"logreg_e969b654a565","name":"threshold","value":"0.5","isJson":"true"},{"parent":"logreg_e969b654a565","name":"regParam","value":"0.1","isJson":"true"}],[{"parent":"logreg_e969b654a565","name":"threshold","value":"0.55","isJson":"true"},{"parent":"logreg_e969b654a565","name":"regParam","value":"0.1","isJson":"true"}],[{"parent":"logreg_e969b654a565","name":"threshold","value":"0.4","isJson":"true"},{"parent":"logreg_e969b654a565","name":"regParam","value":"1.0","isJson":"true"}],[{"parent":"logreg_e969b654a565","name":"threshold","value":"0.45","isJson":"true"},{"parent":"logreg_e969b654a565","name":"regParam","value":"1.0","isJson":"true"}],[{"parent":"logreg_e969b654a565","name":"threshold","value":"0.5","isJson":"true"},{"parent":"logreg_e969b654a565","name":"regParam","value":"1.0","isJson":"true"}],[{"parent":"logreg_e969b654a565","name":"threshold","value":"0.55","isJson":"true"},{"parent":"logreg_e969b654a565","name":"regParam","value":"1.0","isJson":"true"}]]},"defaultParamMap":{"seed":-1191137437,"foldCol":"","numFolds":3},"avgMetrics":[0.9854028531243721,0.9854028531243721,0.9854028531243721,0.9854028531243721,0.9824470341347978,0.9824470341347978,0.9824470341347978,0.9824470341347978,0.9800214319201661,0.9800214319201661,0.9800214319201661,0.9800214319201661,0.9755006362601298,0.9755006362601298,0.9755006362601298,0.9755006362601298,0.97550063626013,0.97550063626013,0.97550063626013,0.97550063626013],"persistSubModels":false}
{"class":"org.apache.spark.ml.tuning.CrossValidatorModel","timestamp":1737492025288,"sparkVersion":"3.5.3","uid":"cv_41bf741c83ca","paramMap":{"foldCol":"","seed":-1191137437,"numFolds":2,"estimatorParamMaps":[[{"parent":"logreg_cb0318836c4e","name":"regParam","value":"1.0E-4","isJson":"true"},{"parent":"logreg_cb0318836c4e","name":"threshold","value":"0.4","isJson":"true"}],[{"parent":"logreg_cb0318836c4e","name":"regParam","value":"0.001","isJson":"true"},{"parent":"logreg_cb0318836c4e","name":"threshold","value":"0.4","isJson":"true"}],[{"parent":"logreg_cb0318836c4e","name":"regParam","value":"0.01","isJson":"true"},{"parent":"logreg_cb0318836c4e","name":"threshold","value":"0.4","isJson":"true"}],[{"parent":"logreg_cb0318836c4e","name":"regParam","value":"0.1","isJson":"true"},{"parent":"logreg_cb0318836c4e","name":"threshold","value":"0.4","isJson":"true"}],[{"parent":"logreg_cb0318836c4e","name":"regParam","value":"1.0","isJson":"true"},{"parent":"logreg_cb0318836c4e","name":"threshold","value":"0.4","isJson":"true"}],[{"parent":"logreg_cb0318836c4e","name":"regParam","value":"1.0E-4","isJson":"true"},{"parent":"logreg_cb0318836c4e","name":"threshold","value":"0.45","isJson":"true"}],[{"parent":"logreg_cb0318836c4e","name":"regParam","value":"0.001","isJson":"true"},{"parent":"logreg_cb0318836c4e","name":"threshold","value":"0.45","isJson":"true"}],[{"parent":"logreg_cb0318836c4e","name":"regParam","value":"0.01","isJson":"true"},{"parent":"logreg_cb0318836c4e","name":"threshold","value":"0.45","isJson":"true"}],[{"parent":"logreg_cb0318836c4e","name":"regParam","value":"0.1","isJson":"true"},{"parent":"logreg_cb0318836c4e","name":"threshold","value":"0.45","isJson":"true"}],[{"parent":"logreg_cb0318836c4e","name":"regParam","value":"1.0","isJson":"true"},{"parent":"logreg_cb0318836c4e","name":"threshold","value":"0.45","isJson":"true"}],[{"parent":"logreg_cb0318836c4e","name":"regParam","value":"1.0E-4","isJson":"true"},{"parent":"logreg_cb0318836c4e","name":"threshold","value":"0.5","isJson":"true"}],[{"parent":"logreg_cb0318836c4e","name":"regParam","value":"0.001","isJson":"true"},{"parent":"logreg_cb0318836c4e","name":"threshold","value":"0.5","isJson":"true"}],[{"parent":"logreg_cb0318836c4e","name":"regParam","value":"0.01","isJson":"true"},{"parent":"logreg_cb0318836c4e","name":"threshold","value":"0.5","isJson":"true"}],[{"parent":"logreg_cb0318836c4e","name":"regParam","value":"0.1","isJson":"true"},{"parent":"logreg_cb0318836c4e","name":"threshold","value":"0.5","isJson":"true"}],[{"parent":"logreg_cb0318836c4e","name":"regParam","value":"1.0","isJson":"true"},{"parent":"logreg_cb0318836c4e","name":"threshold","value":"0.5","isJson":"true"}],[{"parent":"logreg_cb0318836c4e","name":"regParam","value":"1.0E-4","isJson":"true"},{"parent":"logreg_cb0318836c4e","name":"threshold","value":"0.55","isJson":"true"}],[{"parent":"logreg_cb0318836c4e","name":"regParam","value":"0.001","isJson":"true"},{"parent":"logreg_cb0318836c4e","name":"threshold","value":"0.55","isJson":"true"}],[{"parent":"logreg_cb0318836c4e","name":"regParam","value":"0.01","isJson":"true"},{"parent":"logreg_cb0318836c4e","name":"threshold","value":"0.55","isJson":"true"}],[{"parent":"logreg_cb0318836c4e","name":"regParam","value":"0.1","isJson":"true"},{"parent":"logreg_cb0318836c4e","name":"threshold","value":"0.55","isJson":"true"}],[{"parent":"logreg_cb0318836c4e","name":"regParam","value":"1.0","isJson":"true"},{"parent":"logreg_cb0318836c4e","name":"threshold","value":"0.55","isJson":"true"}]]},"defaultParamMap":{"foldCol":"","seed":-1191137437,"numFolds":3},"avgMetrics":[0.9185040705563094,0.9249538293381576,0.9334388662746871,0.9367933061962913,0.9461499321573947,0.9185040705563094,0.9249538293381576,0.9334388662746871,0.9367933061962913,0.9461499321573947,0.9185040705563094,0.9249538293381576,0.9334388662746871,0.9367933061962913,0.9461499321573947,0.9185040705563094,0.9249538293381576,0.9334388662746871,0.9367933061962913,0.9461499321573947],"persistSubModels":false}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 049985d

Please sign in to comment.