Skip to content

Commit

Permalink
Updated Apache Spark dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
@vruusmann
vruusmann committed Dec 28, 2023
1 parent 1255f0e commit 54bd93b
Show file tree
Hide file tree
Showing 65 changed files with 13,418 additions and 13,418 deletions.
Binary file modified pmml-sparkml-lightgbm/src/test/resources/pipeline/LightGBMAudit.zip
View file
Binary file not shown.
Binary file modified pmml-sparkml-lightgbm/src/test/resources/pipeline/LightGBMAuditNA.zip
View file
Binary file not shown.
Binary file modified pmml-sparkml-lightgbm/src/test/resources/pipeline/LightGBMAuto.zip
View file
Binary file not shown.
Binary file modified pmml-sparkml-lightgbm/src/test/resources/pipeline/LightGBMAutoNA.zip
View file
Binary file not shown.
Binary file modified pmml-sparkml-lightgbm/src/test/resources/pipeline/LightGBMIris.zip
View file
Binary file not shown.
1,012 changes: 506 additions & 506 deletions pmml-sparkml-xgboost/src/test/resources/csv/XGBoostHousing.csv
View file

Large diffs are not rendered by default.

Binary file modified pmml-sparkml-xgboost/src/test/resources/pipeline/TransformersAuditNA.zip
View file
Binary file not shown.
Binary file modified pmml-sparkml-xgboost/src/test/resources/pipeline/TransformersAutoNA.zip
View file
Binary file not shown.
Binary file modified pmml-sparkml-xgboost/src/test/resources/pipeline/XGBoostAudit.zip
View file
Binary file not shown.
Binary file modified pmml-sparkml-xgboost/src/test/resources/pipeline/XGBoostAuto.zip
View file
Binary file not shown.
Binary file modified pmml-sparkml-xgboost/src/test/resources/pipeline/XGBoostClassificationModelAuditNA.zip
View file
Binary file not shown.
Binary file modified pmml-sparkml-xgboost/src/test/resources/pipeline/XGBoostHousing.zip
View file
Binary file not shown.
Binary file modified pmml-sparkml-xgboost/src/test/resources/pipeline/XGBoostIris.zip
View file
Binary file not shown.
Binary file modified pmml-sparkml-xgboost/src/test/resources/pipeline/XGBoostRegressionModelAutoNA.zip
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion pmml-sparkml/src/main/java/org/jpmml/sparkml/ConverterFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ private String formatVersion(int[] version){
return String.valueOf(version[0]) + "." + String.valueOf(version[1]);
}

private static final int[] VERSION = {3, 4};
private static final int[] VERSION = {3, 5};

private static final Map<Class<? extends Transformer>, Class<? extends TransformerConverter<?>>> converters = new LinkedHashMap<>();

Expand Down
82 changes: 41 additions & 41 deletions pmml-sparkml/src/test/resources/csv/GBTAudit.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Adjusted,probability(0),probability(1)
0,0.9250238852589634,0.0749761147410366
0,0.7511899746657468,0.24881002533425323
0,0.9403792037114966,0.059620796288503364
1,0.12043819501078892,0.8795618049892111
1,0.12043819501078895,0.8795618049892111
0,0.9377371770899584,0.06226282291004159
0,0.6852552432511856,0.3147447567488144
0,0.9250238852589634,0.0749761147410366
Expand Down Expand Up @@ -88,7 +88,7 @@ Adjusted,probability(0),probability(1)
0,0.9570367416059995,0.0429632583940005
0,0.6816532144182279,0.3183467855817721
0,0.9563403924318404,0.043659607568159564
0,0.7843405260844057,0.21565947391559426
0,0.7843405260844056,0.21565947391559437
1,0.33707380161448364,0.6629261983855164
0,0.6693129463197931,0.3306870536802069
0,0.9543908674791979,0.04560913252080212
Expand All @@ -103,7 +103,7 @@ Adjusted,probability(0),probability(1)
0,0.777641238982115,0.222358761017885
0,0.5471810183139524,0.4528189816860476
0,0.9250238852589634,0.0749761147410366
1,0.4304810152150304,0.5695189847849695
1,0.4304810152150303,0.5695189847849698
0,0.9207934699889503,0.07920653001104971
0,0.9443634999223386,0.05563650007766141
0,0.6693129463197931,0.3306870536802069
Expand Down Expand Up @@ -164,7 +164,7 @@ Adjusted,probability(0),probability(1)
0,0.6754279749583871,0.32457202504161287
0,0.7898476763896576,0.21015232361034242
0,0.9556560161524521,0.044343983847547896
1,0.09901859814335381,0.9009814018566462
1,0.09901859814335386,0.9009814018566461
0,0.9358876028923123,0.06411239710768768
0,0.7942724610660901,0.20572753893390994
1,0.3323034952845711,0.6676965047154289
Expand Down Expand Up @@ -239,7 +239,7 @@ Adjusted,probability(0),probability(1)
1,0.15707640243814353,0.8429235975618565
0,0.9351007162350399,0.06489928376496013
0,0.9401913144429748,0.05980868555702523
1,0.17818484011826832,0.8218151598817317
1,0.17818484011826835,0.8218151598817316
0,0.6852552432511856,0.3147447567488144
0,0.9434365137445644,0.05656348625543561
1,0.4376353579756479,0.5623646420243521
Expand Down Expand Up @@ -304,7 +304,7 @@ Adjusted,probability(0),probability(1)
0,0.5710844930130455,0.42891550698695446
0,0.9272193335611532,0.07278066643884684
0,0.9382348851031528,0.06176511489684722
1,0.05537725490658635,0.9446227450934137
1,0.05537725490658637,0.9446227450934136
0,0.9314438424019605,0.06855615759803946
0,0.9561754442283141,0.04382455577168587
0,0.9314438424019605,0.06855615759803946
Expand Down Expand Up @@ -370,7 +370,7 @@ Adjusted,probability(0),probability(1)
1,0.4106195626172742,0.5893804373827258
0,0.505589593027378,0.49441040697262195
0,0.9250238852589634,0.0749761147410366
0,0.9064785342079688,0.09352146579203124
0,0.9064785342079686,0.09352146579203136
0,0.6205780135555631,0.3794219864444369
0,0.9561754442283141,0.04382455577168587
0,0.6980712735699489,0.3019287264300511
Expand All @@ -380,7 +380,7 @@ Adjusted,probability(0),probability(1)
0,0.9555592011842008,0.04444079881579921
0,0.9475292779759191,0.052470722024080874
0,0.7731877046760728,0.22681229532392722
0,0.9429085360206748,0.057091463979325185
0,0.9429085360206747,0.057091463979325296
0,0.9544901064600955,0.04550989353990453
0,0.6693129463197931,0.3306870536802069
0,0.5710844930130455,0.42891550698695446
Expand Down Expand Up @@ -423,7 +423,7 @@ Adjusted,probability(0),probability(1)
1,0.127914048609203,0.872085951390797
1,0.19489937440002286,0.8051006255999771
1,0.3087423158420887,0.6912576841579112
0,0.728047244218584,0.271952755781416
0,0.7280472442185839,0.2719527557814161
0,0.8118984688881866,0.18810153111181338
0,0.8090452898008845,0.19095471019911547
1,0.444993503131111,0.555006496868889
Expand All @@ -442,7 +442,7 @@ Adjusted,probability(0),probability(1)
0,0.9403792037114966,0.059620796288503364
0,0.9543908674791979,0.04560913252080212
0,0.6852552432511856,0.3147447567488144
1,0.35667595920489104,0.643324040795109
1,0.3566759592048911,0.6433240407951089
1,0.27287102026352306,0.7271289797364769
0,0.9563310442652044,0.04366895573479557
1,0.2086692959165209,0.7913307040834792
Expand Down Expand Up @@ -476,7 +476,7 @@ Adjusted,probability(0),probability(1)
0,0.661150833816577,0.338849166183423
1,0.29397852809082575,0.7060214719091742
0,0.6720197021787404,0.3279802978212596
1,0.15435697409511387,0.8456430259048862
1,0.15435697409511392,0.845643025904886
0,0.5710844930130455,0.42891550698695446
0,0.9555592011842008,0.04444079881579921
0,0.9068058225175417,0.09319417748245828
Expand Down Expand Up @@ -631,7 +631,7 @@ Adjusted,probability(0),probability(1)
0,0.7239728576610577,0.2760271423389423
0,0.9198883218019864,0.08011167819801357
0,0.9551820503377255,0.04481794966227448
0,0.9186797729816044,0.08132022701839559
0,0.9186797729816043,0.0813202270183957
0,0.6574108606213155,0.3425891393786845
0,0.889082035182222,0.11091796481777805
0,0.594664613165915,0.405335386834085
Expand All @@ -648,7 +648,7 @@ Adjusted,probability(0),probability(1)
0,0.9427356944728658,0.05726430552713424
0,0.9290024180144838,0.0709975819855162
0,0.5990052118601462,0.4009947881398538
1,0.26589571241012044,0.7341042875898796
1,0.2658957124101205,0.7341042875898796
0,0.9290024180144838,0.0709975819855162
0,0.9563932815046294,0.04360671849537057
0,0.9236778908803742,0.07632210911962578
Expand All @@ -667,7 +667,7 @@ Adjusted,probability(0),probability(1)
0,0.9373465786489299,0.0626534213510701
1,0.39536120634373406,0.6046387936562659
0,0.9223728871029585,0.0776271128970415
1,0.4304810152150304,0.5695189847849695
1,0.4304810152150303,0.5695189847849698
0,0.9431113306946547,0.05688866930534531
0,0.9124822169624293,0.08751778303757074
0,0.6754279749583871,0.32457202504161287
Expand Down Expand Up @@ -738,7 +738,7 @@ Adjusted,probability(0),probability(1)
0,0.7647142246340082,0.23528577536599182
1,0.31222063380116405,0.687779366198836
0,0.5001883486159818,0.4998116513840182
1,0.26589571241012044,0.7341042875898796
1,0.2658957124101205,0.7341042875898796
0,0.9313669439147416,0.06863305608525838
0,0.9475292779759191,0.052470722024080874
0,0.505589593027378,0.49441040697262195
Expand Down Expand Up @@ -868,7 +868,7 @@ Adjusted,probability(0),probability(1)
1,0.11279062055822754,0.8872093794417725
0,0.9543908674791979,0.04560913252080212
0,0.7460952495810008,0.2539047504189992
1,0.26589571241012044,0.7341042875898796
1,0.2658957124101205,0.7341042875898796
0,0.9314438424019605,0.06855615759803946
0,0.9207934699889503,0.07920653001104971
0,0.9204375632686106,0.07956243673138941
Expand All @@ -878,10 +878,10 @@ Adjusted,probability(0),probability(1)
0,0.8882219734349557,0.11177802656504432
0,0.9313669439147416,0.06863305608525838
0,0.91768982283714,0.08231017716286004
0,0.9557100172760319,0.04428998272396811
0,0.9557100172760321,0.04428998272396789
0,0.9335931474089982,0.06640685259100176
0,0.7647142246340082,0.23528577536599182
0,0.7759601887608761,0.22403981123912386
0,0.775960188760876,0.22403981123912398
0,0.775513586626218,0.22448641337378195
0,0.5465042903273841,0.4534957096726159
0,0.9351007162350399,0.06489928376496013
Expand Down Expand Up @@ -991,7 +991,7 @@ Adjusted,probability(0),probability(1)
1,0.15674068670751587,0.8432593132924842
0,0.944732961400725,0.055267038599274954
0,0.9561754442283141,0.04382455577168587
1,0.34397084594225397,0.6560291540577461
1,0.343970845942254,0.656029154057746
1,0.08642048173915037,0.9135795182608496
0,0.9563310442652044,0.04366895573479557
0,0.9250238852589634,0.0749761147410366
Expand Down Expand Up @@ -1055,9 +1055,9 @@ Adjusted,probability(0),probability(1)
0,0.9004831494163202,0.09951685058367976
0,0.947586435312233,0.052413564687767034
0,0.9223728871029585,0.0776271128970415
0,0.7499922402660699,0.2500077597339301
0,0.74999224026607,0.25000775973392997
0,0.9551820503377255,0.04481794966227448
1,0.3845932761543696,0.6154067238456304
1,0.38459327615436956,0.6154067238456304
1,0.36600642609100636,0.6339935739089937
1,0.09628023129827974,0.9037197687017202
1,0.15844370773111466,0.8415562922688853
Expand All @@ -1074,7 +1074,7 @@ Adjusted,probability(0),probability(1)
0,0.9150001440650496,0.08499985593495041
0,0.9563310442652044,0.04366895573479557
0,0.9475292779759191,0.052470722024080874
0,0.8473673443302943,0.15263265566970574
0,0.8473673443302941,0.15263265566970585
0,0.6083625275734461,0.3916374724265539
1,0.07095075101980138,0.9290492489801986
0,0.7911909177397056,0.20880908226029438
Expand Down Expand Up @@ -1141,7 +1141,7 @@ Adjusted,probability(0),probability(1)
0,0.9250238852589634,0.0749761147410366
1,0.24934773497304696,0.750652265026953
0,0.9290024180144838,0.0709975819855162
1,0.17818484011826832,0.8218151598817317
1,0.17818484011826835,0.8218151598817316
0,0.8573565416908745,0.1426434583091255
0,0.9150820712252061,0.08491792877479387
0,0.9314438424019605,0.06855615759803946
Expand Down Expand Up @@ -1286,7 +1286,7 @@ Adjusted,probability(0),probability(1)
0,0.6816532144182279,0.3183467855817721
0,0.91768982283714,0.08231017716286004
0,0.9068058225175417,0.09319417748245828
0,0.941062415362901,0.05893758463709897
0,0.9410624153629013,0.05893758463709875
0,0.6656174981376516,0.3343825018623484
1,0.15636197231709678,0.8436380276829032
0,0.9234939320376895,0.07650606796231052
Expand Down Expand Up @@ -1335,7 +1335,7 @@ Adjusted,probability(0),probability(1)
0,0.9351007162350399,0.06489928376496013
0,0.9382348851031528,0.06176511489684722
0,0.9556204055974105,0.04437959440258954
1,0.1592029839746504,0.8407970160253496
1,0.15920298397465038,0.8407970160253496
0,0.8755222571799517,0.12447774282004831
0,0.9475292779759191,0.052470722024080874
0,0.9431920185564411,0.05680798144355892
Expand Down Expand Up @@ -1419,7 +1419,7 @@ Adjusted,probability(0),probability(1)
0,0.9463249034355503,0.05367509656444969
0,0.9262878841739303,0.07371211582606974
0,0.9223728871029585,0.0776271128970415
0,0.7759601887608761,0.22403981123912386
0,0.775960188760876,0.22403981123912398
0,0.7727084369486293,0.22729156305137066
0,0.6140870440506723,0.38591295594932773
0,0.5754905510585648,0.42450944894143516
Expand Down Expand Up @@ -1450,7 +1450,7 @@ Adjusted,probability(0),probability(1)
0,0.9563932815046294,0.04360671849537057
0,0.9250238852589634,0.0749761147410366
0,0.6754279749583871,0.32457202504161287
1,0.37660352747900727,0.6233964725209927
1,0.37660352747900716,0.6233964725209928
0,0.6816532144182279,0.3183467855817721
1,0.43346913777505075,0.5665308622249492
0,0.777641238982115,0.222358761017885
Expand All @@ -1469,7 +1469,7 @@ Adjusted,probability(0),probability(1)
1,0.10818617361792501,0.891813826382075
1,0.19153202923946494,0.8084679707605351
1,0.19820547413729311,0.8017945258627068
0,0.8039170607823651,0.19608293921763487
0,0.803917060782365,0.19608293921763498
0,0.9567356709456674,0.04326432905433264
0,0.6831665707796839,0.3168334292203161
0,0.8558284392211115,0.14417156077888849
Expand All @@ -1493,7 +1493,7 @@ Adjusted,probability(0),probability(1)
0,0.9556560161524521,0.044343983847547896
0,0.6852552432511856,0.3147447567488144
0,0.9346688294130137,0.06533117058698634
1,0.4260366586427244,0.5739633413572756
1,0.42603665864272444,0.5739633413572756
0,0.9042609300301182,0.0957390699698818
1,0.46528350062009416,0.5347164993799058
0,0.9555592011842008,0.04444079881579921
Expand Down Expand Up @@ -1552,7 +1552,7 @@ Adjusted,probability(0),probability(1)
0,0.9063434596213917,0.09365654037860827
0,0.9368490396317319,0.06315096036826806
0,0.9221270010850549,0.07787299891494515
1,0.23826805866487208,0.7617319413351279
1,0.23826805866487202,0.761731941335128
0,0.8570909382838691,0.14290906171613094
0,0.9422718902195077,0.057728109780492254
0,0.9314438424019605,0.06855615759803946
Expand All @@ -1572,7 +1572,7 @@ Adjusted,probability(0),probability(1)
0,0.6852552432511856,0.3147447567488144
0,0.952710545660789,0.047289454339210946
0,0.6435866173179755,0.3564133826820245
1,0.18198973848148767,0.8180102615185123
1,0.18198973848148764,0.8180102615185123
0,0.9150820712252061,0.08491792877479387
0,0.9314438424019605,0.06855615759803946
0,0.6852552432511856,0.3147447567488144
Expand All @@ -1596,7 +1596,7 @@ Adjusted,probability(0),probability(1)
0,0.8462143695908189,0.15378563040918114
0,0.9487554639988187,0.051244536001181284
0,0.9346688294130137,0.06533117058698634
0,0.9434140289463295,0.05658597105367047
0,0.9434140289463293,0.05658597105367069
0,0.8373878357974771,0.1626121642025229
0,0.6045225581976792,0.3954774418023208
0,0.5701365038395838,0.4298634961604162
Expand Down Expand Up @@ -1636,7 +1636,7 @@ Adjusted,probability(0),probability(1)
0,0.9536501261590647,0.04634987384093525
0,0.9423536959242315,0.05764630407576854
0,0.5094410912786863,0.4905589087213137
0,0.7759601887608761,0.22403981123912386
0,0.775960188760876,0.22403981123912398
0,0.9250238852589634,0.0749761147410366
0,0.5754905510585648,0.42450944894143516
0,0.9551820503377255,0.04481794966227448
Expand Down Expand Up @@ -1666,7 +1666,7 @@ Adjusted,probability(0),probability(1)
0,0.9204375632686106,0.07956243673138941
0,0.9250238852589634,0.0749761147410366
1,0.3305023047109405,0.6694976952890594
1,0.26589571241012044,0.7341042875898796
1,0.2658957124101205,0.7341042875898796
0,0.6852552432511856,0.3147447567488144
1,0.2448766763050823,0.7551233236949177
1,0.27253489854117935,0.7274651014588207
Expand All @@ -1686,7 +1686,7 @@ Adjusted,probability(0),probability(1)
0,0.9382348851031528,0.06176511489684722
0,0.8445068561818738,0.15549314381812618
0,0.8679767820890967,0.13202321791090332
0,0.9319209687518638,0.06807903124813619
0,0.9319209687518637,0.0680790312481363
0,0.9290024180144838,0.0709975819855162
0,0.91768982283714,0.08231017716286004
0,0.7731877046760728,0.22681229532392722
Expand Down Expand Up @@ -1747,7 +1747,7 @@ Adjusted,probability(0),probability(1)
1,0.127914048609203,0.872085951390797
1,0.34948142768260965,0.6505185723173903
0,0.9443634999223386,0.05563650007766141
1,0.4304810152150304,0.5695189847849695
1,0.4304810152150303,0.5695189847849698
0,0.6756788709669843,0.3243211290330157
0,0.9160699247715036,0.08393007522849638
1,0.3504330684263271,0.649566931573673
Expand Down Expand Up @@ -1779,7 +1779,7 @@ Adjusted,probability(0),probability(1)
1,0.4644576915004006,0.5355423084995994
0,0.9463249034355503,0.05367509656444969
0,0.9223728871029585,0.0776271128970415
1,0.2278007236579661,0.7721992763420339
1,0.22780072365796616,0.7721992763420338
0,0.9337328582956764,0.06626714170432357
0,0.6717673505494978,0.32823264945050223
1,0.46528350062009416,0.5347164993799058
Expand Down Expand Up @@ -1810,21 +1810,21 @@ Adjusted,probability(0),probability(1)
0,0.6816532144182279,0.3183467855817721
0,0.9046795016327726,0.09532049836722745
0,0.9562768013660353,0.04372319863396468
1,0.4304810152150304,0.5695189847849695
1,0.4304810152150303,0.5695189847849698
0,0.6131756552686157,0.3868243447313843
0,0.9351007162350399,0.06489928376496013
0,0.9505537853694589,0.04944621463054111
0,0.949338760672864,0.050661239327135954
0,0.9313669439147416,0.06863305608525838
0,0.9046795016327726,0.09532049836722745
0,0.9223728871029585,0.0776271128970415
0,0.6688511251547969,0.33114887484520306
0,0.6688511251547972,0.33114887484520283
0,0.7938951350888425,0.20610486491115754
0,0.8875398387078932,0.11246016129210679
0,0.6852552432511856,0.3147447567488144
0,0.650057954883923,0.34994204511607696
0,0.9223728871029585,0.0776271128970415
0,0.5034612626095099,0.49653873739049015
0,0.50346126260951,0.49653873739049004
1,0.11279062055822754,0.8872093794417725
0,0.9369286293598282,0.06307137064017176
0,0.6756788709669843,0.3243211290330157
Expand Down Expand Up @@ -1860,7 +1860,7 @@ Adjusted,probability(0),probability(1)
0,0.9227637586694795,0.07723624133052054
1,0.06964350130326638,0.9303564986967336
0,0.9563932815046294,0.04360671849537057
1,0.18198973848148767,0.8180102615185123
1,0.18198973848148764,0.8180102615185123
0,0.661150833816577,0.338849166183423
0,0.9563932815046294,0.04360671849537057
0,0.9521202158486411,0.04787978415135885
Expand Down
Loading

0 comments on commit 54bd93b

Please sign in to comment.