diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 31b81cc34c792a3281501c42de87f7047f488696..067fbfe97eb116027ca2bf06b865139988a534b0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -100,7 +100,9 @@ test-intel-bin: - cd ../param - mpiexec -n 2 ../../../bin/sisso++ - python ../check_model.py - - cd ../../../ + - cd ../reparam + - mpiexec -n 2 ../../../bin/sisso++ + - cd ../../../ build-gnu: stage: build @@ -180,4 +182,6 @@ test-gnu-bin: - cd ../param - mpiexec -n 1 ../../../bin/sisso++ - python ../check_model.py + - cd ../reparam + - mpiexec -n 1 ../../../bin/sisso++ - cd ../../../ diff --git a/tests/exec_test/reparam/check_model.py b/tests/exec_test/reparam/check_model.py new file mode 100644 index 0000000000000000000000000000000000000000..c5333171fe1ec06b4c080da8ae8de18ed18dd322 --- /dev/null +++ b/tests/exec_test/reparam/check_model.py @@ -0,0 +1,10 @@ +from sissopp import ModelRegressor +from pathlib import Path + +import numpy as np + +model = ModelRegressor( + str("models/train_dim_2_model_0.dat"), str("models/test_dim_2_model_0.dat") +) +assert model.rmse < 1e-3 +assert model.test_rmse < 1e-3 diff --git a/tests/exec_test/reparam/data.csv b/tests/exec_test/reparam/data.csv new file mode 100644 index 0000000000000000000000000000000000000000..19bd47732fc7b57681d72ffeec5215b5f823bdac --- /dev/null +++ b/tests/exec_test/reparam/data.csv @@ -0,0 +1,200 @@ +Sample,Prop,A (m),B,C ,D (Unitless) +1,727.118939908528,-26.9598915689615,16.4770933201292,-2.3456689341142,-44.347548060136 +2,4061.71941599051,-63.7344834181458,-0.473998625420511,-4.89234477177099,1.80584885776461 +3,5299.04050897752,-72.7950448428438,-0.041798823456847,-7.07837005584224,48.0928566759633 +4,1375.77566461643,-37.0913938631186,0.542538989935228,-5.67314711587992,-6.63267687110276 +5,120.602129063925,-11.001120431754,-0.485377837185949,-5.00603570699514,15.9117421465142 +6,341.757364891539,18.4763248591176,45.463422582209,-3.54317005919354,-14.7878213495168 +7,304.476105142188,-17.4403258467529,21.9523438691943,-6.35861222826073,-47.3766079570739 +8,2931.92999380806,-54.1451148162277,10.147801679562,-7.60672120838089,-22.3898912622486 +9,1921.95555585739,-43.8467983050434,-0.497153478218677,-2.25234722784919,43.9272285404933 +10,3907.42119504189,-62.5085507107758,2.28105625283137,-3.43022785454677,8.19384171276104 +11,166.877248480643,-12.90112483941,79.5189583527563,-4.30079724754646,-12.4087676815772 +12,205.095395730327,-14.3204344263206,0.728182848148043,-1.67196862061437,19.8996028130594 +13,3563.77318219706,-59.6968588654461,1.29003999054027,-5.44656566587949,-15.2272436669887 +14,3945.77318117953,-62.810861209267,295.084070008889,-5.40735078566055,-42.8531828927498 +15,5927.41275262953,-76.9929995375143,-0.493855829552637,-1.4315831772722,-23.8750759982545 +16,1888.25703070108,-43.4528362022336,2.44634915519088,-6.02764925690289,2.00530269634198 +17,5152.93096871797,-71.7800444129219,259.824249962042,-4.87847438811516,-1.14593805194346 +18,2.94147443019837,1.77903648082263,-0.393003986154435,-3.30485346593225,-31.1066062424722 +19,3041.79089923232,-55.1550772610619,-0.445876370492354,-2.98493082242597,11.4007261016967 +20,14.9050769170286,3.91891619301887,-0.489200679988903,-5.89212500915864,13.332244433362 +21,2236.07246678801,-47.2911803424441,-0.478349222990864,-1.48969943715326,-49.8357259223171 +22,43.9412846659196,-6.67172116893789,-0.496673341397219,-6.98473833216711,24.3378172389092 +23,198.981890427795,-14.0940878772357,29.0408297437264,-5.02795165977473,24.458688886489 +24,340.345389578719,18.4524777037321,-0.273596909044756,-4.03160675969822,-45.7650654495297 +25,31.0005079189483,-5.62128870102401,-0.497480733303151,-7.88745749841534,29.8635497822435 +26,5273.438106727,-72.6184893467069,0.43343615842018,-5.72249460051619,2.24766880043221 +27,117.569703499072,10.8174877144636,248.295298756743,-4.07722001869143,-44.1648618659459 +28,40.7631423786567,6.42828632159915,-0.496291866163785,-3.61371438533051,-36.5850314016794 +29,4820.82683295394,-69.436530178802,-0.49763955041834,-5.87286492489537,-43.9849567179791 +30,588.90340069208,-24.2686365786508,0.030886543934811,-5.26329667125282,-29.0983093347683 +31,3511.40403894796,-59.2619394123934,-0.496766660265218,-5.12016109436414,5.75915813790093 +32,52.2713678393477,7.20352530063482,44.4661877774354,-7.99605678100631,-19.5563042860325 +33,159.490205968011,12.6288219954758,0.531083041050068,-2.93209993389513,33.733737070524 +34,25.9996602693095,5.11720640360599,-0.344546880940562,-4.74718269758769,-43.284304200484 +35,190.365293747315,13.7862783611727,20.3682101543091,-6.58308111461873,-39.5586964516148 +36,5595.93420766635,-74.8066238254682,-0.120007965217726,-5.70401509554886,4.90691611925422 +37,1650.53476835268,-40.6205669665801,154.445998984365,-3.09079843604824,17.8669954108563 +38,35.4430195477034,-5.92487161906894,29.1409974656196,-3.44316474412239,-19.2637628682529 +39,86.7620418918003,9.30851852302476,2.61194515688744,-5.6473419999351,-2.63614370437764 +40,4954.87311146266,-70.3943965755962,-0.493123034576539,-4.76211439558765,27.7529260381853 +41,3980.67608068829,-63.093837937864,-0.290503953641989,-4.02071835875608,-10.0021344448853 +42,4661.68461965629,-68.2755606153041,3.26001603587903,-2.26361828777514,9.86622823185131 +43,96.3197455818231,-9.78367054387746,401.06230699025,-4.24735440947351,25.2777827117253 +44,1292.36574778388,-35.9559408271055,-0.490335827462934,-2.76562716567933,33.0110367114817 +45,2699.67562292752,-51.955532416585,19.2418819634039,-7.93032952624575,-37.7246791504005 +46,2579.35068127823,-50.7866432699566,1.46494937970502,-3.33474965791084,-32.641898315556 +47,344.809108889708,-18.5646811911955,4.53901985423472,-5.88059238472936,-42.5071616014547 +48,373.037808772813,19.3289803897382,-0.496709584204927,-7.82002765371011,26.3987049932634 +49,74.6146563446771,8.65080448547252,-0.39113198608151,-5.87551870334558,-27.9879144209769 +50,4327.73284580549,-65.7857361126348,0.239115736998907,-7.51279975590682,-31.2558626644226 +51,193.22200177049,-13.889527800167,20.201219028094,-3.48241903422821,6.67534002352448 +52,659.348935615868,-25.6846232941466,-0.470084587510066,-6.06742159260695,-10.7428299736182 +53,2152.60396391745,-46.389849089785,349.752192224117,-1.73354846107454,45.2227066819777 +54,2111.10247581623,-45.9448330787616,5.24248365745649,-3.93910535917686,11.443077037234 +55,1.36739710028255,1.21024970063709,-0.12207986021608,-5.6353088555368,22.0715445632689 +56,45.9284261527926,6.82015137032394,-0.497149855583102,-7.31727496920493,-20.5681946954325 +57,80.0409910378484,8.93502324443354,7.37353072583526,-6.34031949834672,-1.31396024522537 +58,2698.92606173825,-51.9509054197567,0.842962584360503,-3.95367000561231,-10.7220214875492 +59,223.173338902568,-14.9239411443508,88.9067538027111,-6.75057235340986,-44.5670983442402 +60,986.438087285111,-31.416557856837,-0.496376094142896,-2.41936247413012,-18.8843963170741 +61,3603.62585515515,-60.033076560273,-0.468071663261977,-5.23055650631282,-23.9353018345737 +62,2725.94117253617,-52.2120406857653,-0.289906027110049,-5.97771240402116,-46.9075094897443 +63,58.1825600691546,-7.60975121560017,15.0252085090386,-2.78441960890466,7.97132000366891 +64,900.060646307109,-30.0109652633393,-0.497455693859477,-2.87174725747444,41.5563304679875 +65,240.440369967361,15.5234123258985,-0.495297225968755,-6.95963559575148,19.023992883741 +66,130.720418025616,11.4466418568071,-0.452731809921819,-5.86878464024433,5.51701410010501 +67,798.915022613098,-28.2644698934095,0.915726145442695,-4.83119267608722,-13.9310642459825 +68,3166.34648080747,-56.2690045870611,3.78892400893538,-2.14800032699086,47.4127025417918 +69,1862.50555078432,-43.1632002022201,-0.496162787648307,-7.01453652131387,-46.2567154326572 +70,2225.06356376351,-47.1771065084369,-0.497883830044414,-1.60661352497764,-38.5981595172128 +71,4363.67954111128,-66.0540149800446,236.121371085305,-6.19620347378171,-23.9170134906467 +72,47.4330512347074,-6.85891697714553,48.0741430502517,-1.65386604219128,-33.8665151302642 +73,273.361492900149,16.5158104574122,362.708972278198,-2.42857733468406,24.6791000675707 +74,5698.3621224726,-75.4835322367884,396.857072452073,-2.12354307871309,46.6747044684097 +75,6.93822007640483,-2.56841533011229,29.9056268334466,-3.2934374528907,30.549085663698 +76,3804.12058111338,-61.6766293536255,2.62591452640418,-4.54238642583241,-38.5971464888276 +77,134.316567729976,-11.5723032332386,53.2130548753723,-5.56153622028371,12.3936081168232 +78,277.715236014706,16.6491893365343,180.284282189547,-5.58878933240212,-3.94425294613453 +79,2061.79596051702,-45.409836204165,-0.423665915287556,-6.04367749499791,-17.6757195025452 +80,1561.24736538265,-39.5132873144389,0.091502063189858,-1.45277556561637,24.2040229161337 +81,34.0596998102802,5.86003773869783,-0.439397848717482,-2.23036190221381,-6.73321698527632 +82,2510.6583057027,-50.1081985824405,-0.323175001743296,-4.63455457225095,-24.1915568326123 +83,5434.36557769286,-73.7200587656617,-0.440087325236099,-3.55829477285746,11.8636293616561 +84,349.683203403743,-18.702078055099,-0.070529297414911,-3.21604886152984,-18.8030480996723 +85,1707.69027357697,-41.3278643201009,-0.451245454115031,-5.99995173374799,7.23178224244262 +86,18.1838163310785,4.32102167924892,-0.492358185581036,-5.70722855516919,-25.9853423656035 +87,62.3089597870843,-7.89579168858238,0.207748818743325,-4.59158145901213,18.8843752486005 +88,585.053895669179,-24.1840519644013,5.89337643977028,-6.31738877363181,-39.545785321285 +89,659.90151546788,-25.6857212498618,3.77333017085669,-1.82286323533721,14.5858684182696 +90,2410.56011326419,-49.1007606547447,-0.461064003773782,-2.41698107113692,-5.76452344036105 +91,2921.73290300668,-54.0537986772741,-0.051785947968437,-5.80921192537188,16.2062779607103 +92,3109.93452254675,-55.7673374815322,0.041142667821485,-7.61725050011638,-10.0557542574519 +93,227.411819890352,-15.0617323836765,259.420269606632,-2.2703256277641,-18.5905317905508 +94,1867.21892320968,-43.2127870741805,-0.216469361060176,-6.12158829671141,-19.8709477409517 +95,5699.39516510841,-75.4966175565072,-0.467966519292414,-7.54123138852082,20.9077422324457 +96,290.202417629196,-17.0276183617925,13.3226084269137,-2.08580113689997,47.2792952472548 +97,3695.78925952401,-60.7934359649989,0.090982386990098,-3.04091195810171,-7.64062716861136 +98,5688.83043824682,-75.4236464811022,2.32892676678235,-6.51472539028649,-15.6475137662788 +99,2992.642878234,-54.7106879317446,-0.497898191905685,-2.35274267919398,29.2605946788015 +100,989.267834468171,-31.4470701142083,32.4884335775792,-4.35392293427778,-36.7846960600504 +101,1899.92448558932,-43.5832066780196,72.1615605126635,-1.65340984784069,-0.185767759183975 +102,979.619493391994,-31.2961341604768,5.05556436786726,-4.1887716494893,-41.2570400474365 +103,1574.0642011217,-39.669540069504,49.795618058032,-2.09671656243407,15.2097207002341 +104,4724.37194110142,-68.7382726486335,-0.496917012438291,-3.07658993169754,-22.7964913357467 +105,2175.06939879858,-46.6408752377136,-0.451122661430972,-4.88687519160418,-40.0520171310077 +106,3491.40218254105,-59.0856505796252,17.3281957490917,-4.87613034856812,-2.84184207378766 +107,0.886952180829067,0.99516304638658,-0.144408642860048,-4.31632665709326,-34.0420098413868 +108,1215.36781550186,-34.8685562807829,-0.488712011042624,-4.12892511649074,16.6969910270682 +109,379.710664287565,19.4891331200602,-0.185400487713524,-3.68146314555071,-35.3067445989357 +110,2.98511787558458,-1.88822533937767,-0.496980821688295,-7.90421518219377,-48.8860551153697 +111,199.430928540483,14.1380244400304,-0.489198445976491,-3.3984085008333,-33.5717844654845 +112,1180.61862245606,-34.3623602661506,-0.283855053275166,-7.13477700249137,-15.399187347615 +113,3770.71972756117,-61.4012210435464,444.386515035363,-5.25859640791155,41.7692170340535 +114,180.612191910722,-13.4194423080587,201.365273913345,-2.33176731297801,19.4153752835369 +115,3404.07028050788,-58.3448857005669,0.074606946410731,-5.33740122822168,-30.1412507886228 +116,2624.23016638862,-51.2213511900404,416.666970993708,-1.94522330346958,9.26728796673105 +117,1424.02657543374,-37.7322290284518,20.7143912093735,-6.71043958378988,-8.33671639342791 +118,131.103968712495,11.4611946675192,-0.421929650550317,-2.2522108971003,-25.9260914395905 +119,3229.71826581323,-56.8288336135006,7.03349760173323,-1.49927838234687,-0.791847301150289 +120,366.09787973306,19.1441244058617,-0.481614543609921,-1.44284832839425,-30.0047691072164 +121,4141.10977850684,-64.3520862004493,-0.056118849849309,-6.69158253407763,17.3262223314447 +122,12.5819279402761,3.6291958906162,-0.497236752669632,-3.18974587324306,49.9165426319515 +123,4636.00047143652,-68.0890665063311,-0.200326781773338,-2.7843544422723,11.356336523518 +124,-0.541681781663468,-0.03986491591472,-0.495628766008611,-5.08976431577769,35.1504145643644 +125,1537.47166486813,-39.2030697053123,368.171308993572,-6.55459610762837,45.2961662340095 +126,497.408449283902,-22.2993020682629,3.96275158307667,-3.00296673932356,-39.9924408622542 +127,691.072174615786,-26.276537455132,471.764801457238,-4.86235261212403,15.3356886667449 +128,385.986127964809,-19.6525068195878,-0.404531916482237,-5.70827709662873,-32.6369510009034 +129,423.86896132636,-20.5816480004248,13.6154385315001,-7.73089443430312,-29.0967438066763 +130,1298.38869025377,-36.0279261115311,42.980108527344,-4.55299865372591,-37.0625398905495 +131,20.8413888211178,-4.56616804634005,0.418495693471633,-5.64575793292945,-22.9826840284982 +132,5323.34631127605,-72.9652412434823,-0.496976029074175,-3.25644958325088,-44.0530723759284 +133,123.213304227256,-11.0756331150067,229.149283367814,-4.34485228940315,-28.7479247882604 +134,137.086727714487,11.7327801342422,-0.496700616479115,-7.57820562812251,-49.1016126374255 +135,6002.9608765017,-77.478375790133,1.36193123292372,-5.34585428475751,29.3489743252839 +136,260.09483215086,16.133734695001,-0.368089363013755,-6.28682745418137,32.3609017455856 +137,572.575216544238,-23.9358831695317,-0.470188635894022,-7.51292296284087,-32.9506740264378 +138,5799.384361479,-76.1542692325353,-0.086711186730361,-5.28542445269072,27.7861610902532 +139,196.301858419301,13.992909122283,148.437558598205,-5.51366789564913,12.6980971652698 +140,668.414347501324,-25.8458632692668,57.3002832907674,-3.08339476592921,-7.37760993821234 +141,49.2978263996808,-7.04432340186688,-0.461095988258968,-2.88200643578584,49.6085415774666 +142,1501.7900235203,-38.7498577179414,10.3645326218017,-2.91762623451623,-47.4155232307921 +143,192.734366241125,-13.8816226585557,0.917912991161896,-3.49050579636698,-35.6224457233954 +144,12.2658102651698,3.53143032766324,-0.371509324270874,-7.03011821724418,1.21161131015394 +145,353.649768526282,18.8122590603734,-0.418993370598105,-6.14798037645281,-25.0771629156771 +146,2059.95355881619,-45.3876994246683,-0.092209810577898,-2.79777883290398,-0.853483451876269 +147,99.400689501916,9.99205418108014,-0.487778670782909,-3.49311416012508,21.0171256311828 +148,226.675085185607,15.0422808688224,56.8237194838239,-2.64721026358376,-27.2278798040954 +149,1196.6847234568,-34.5864321336299,102.461715619825,-3.52893656424693,49.5218992208287 +150,31.7086413345147,-5.59124787191003,86.4980490563059,-4.76372343793376,31.7807673388218 +151,100.030213016967,10.0066790715896,-0.144464525900901,-5.56832131334509,-12.8574842512773 +152,4655.85713853655,-68.2309353153849,52.2754036963755,-4.92032582476456,-11.5622021238651 +153,1161.33564666774,-34.0749980077669,9.48989801791842,-3.83226401506356,34.9039679881372 +154,88.4573274221266,-9.40065364833522,1.84054559321013,-4.43433590851494,-1.8055105618341 +155,3343.83621823161,-57.829383681368,-0.481938765044759,-5.61197379728001,-12.4561765493944 +156,1384.23114476494,-37.2033227674863,3.71731315316413,-3.88978463305878,2.67458671547165 +157,1183.58687224275,-34.4091686838208,-0.482405566208497,-3.90279531883483,15.911675534846 +158,64.6856222477585,8.03154400480111,5.5449998969451,-7.50549951967315,-29.5014377342349 +159,3527.95519324554,-59.4002320137843,-0.486749241178061,-3.73141206139273,-47.8326545592386 +160,1459.85057436967,-38.2147900954803,-0.49446175003812,-5.57131405422011,38.0204594133977 +161,4389.55800424322,-66.2569615714253,-0.486011564704861,-7.99486733240653,19.8030175200339 +162,4927.18883200205,-70.1953003392248,-0.352448368336671,-1.64541651154446,29.9566568037513 +163,1996.27917748949,-44.6747579070491,85.284158834146,-3.8510697854708,49.1782649711897 +164,4843.01343134768,-69.5895625336738,20.874042016146,-2.28255417481995,34.3085911428995 +165,3756.18637535125,-61.2913139101584,-0.487572640470121,-7.68537764083691,-41.1416870546773 +166,701.232346648895,-26.483354252606,-0.242583067020683,-6.11042237454046,-33.94234748613 +167,474.528349605384,-21.7903008868779,-0.44434767108865,-3.03465245711155,30.9044847088009 +168,-0.025454589203122,0.073745029251427,0.23423276256698,-1.93475914620777,23.2408437170182 +169,549.961998535782,-23.4508961529066,0.690867000534513,-3.01420494653357,-41.3032597144636 +170,2867.55152377784,-53.5509190800047,-0.275550682323061,-7.14588972174864,17.1468342163848 +171,2532.64099250005,-50.3210224219694,77.5187417778993,-6.95132062918625,-45.0098058198204 +172,390.70914052993,-19.7673220482605,0.184679593295579,-6.01708273481942,-11.5710331447624 +173,3938.14678738956,-62.7529435847603,8.07274834139756,-2.17523738723104,-4.79179895222981 +174,1.1481088115457,-1.0056443961041,3.4270228776115,-4.62101358376104,-15.6920277652284 +175,83.5422772359129,9.11685360583391,69.7862125868159,-6.43013760515447,-8.02094456185238 +176,259.144318084694,-16.0788172577744,472.708813808054,-4.37348452914986,-43.3390418590448 +177,3689.80750194221,-60.7472746089456,-0.485573734262362,-1.43331258152053,32.2520657836497 +178,5260.11663949437,-72.5231127207473,171.519506718457,-5.40439349655734,36.7072086474724 +179,519.223416858943,-22.7981731659259,-0.495169611819957,-4.60544989470716,11.9859491180679 +180,387.237646644648,19.6660668196227,125.291390991448,-7.23510922520872,23.6032842669287 +181,555.354375273459,-23.5629038821836,3.71799174243363,-1.75822155015244,43.0319981537978 +182,1488.4304816389,-38.5783469113112,3.62189205349538,-4.2602267746444,20.8127537359242 +183,2612.12408699515,-51.1063404093681,13.8044341467259,-2.28920960539554,-19.5461471819212 +184,334.001931252976,18.2706603166669,5.85364370083153,-2.03830045830456,-30.93321069934 +185,4387.31281460776,-66.2343361416717,25.4275159855127,-4.35973942715806,-39.3283508835272 +186,2143.17770158481,-46.2997114836124,-0.49221704201524,-2.59961744074765,22.8599617048399 +187,300.830750680389,-17.3439604506534,0.694664825872767,-3.8673543572576,38.6562881703084 +188,2940.27086281968,-54.2199534414422,106.745036306538,-3.02812650312015,49.7409316922086 +189,6085.56648774362,-78.0130202992036,-0.490423897465248,-6.45209495686053,35.398069725534 +190,4442.82683841434,-66.6516093801645,48.8064292375437,-1.44337467515737,5.77066399128683 +191,1198.72029714792,-34.6165007490255,64.9790606216099,-6.06162736248712,36.797785599177 +192,715.115457626605,-26.7403148978951,1.53433275406045,-5.00637057608409,44.1033334580734 +193,201.662785258773,14.2157848317953,-0.485842790102652,-5.09133832098407,21.1443244384268 +194,5041.15495132377,-71.0047453498791,-0.494423025054532,-4.95882313981698,-35.3243342936784 +195,253.2407210479,15.9027257474234,30.6978287601461,-6.53857383673753,49.5396591932987 +196,4922.98620339748,-70.160217182373,200.094046645895,-6.83886505647139,1.76192954250076 +197,379.507528382537,-19.4945251532755,-0.49495736084227,-5.25629343542096,14.4465537360302 +198,5163.55722322911,-71.8615847922921,-0.495015670094684,-5.43472132756901,-37.1812519856081 +199,453.869051802097,-21.3140043260099,-0.484659916974663,-6.61214970062417,-24.4760444892339 diff --git a/tests/exec_test/reparam/sisso.json b/tests/exec_test/reparam/sisso.json new file mode 100644 index 0000000000000000000000000000000000000000..73ba070e9f39d512b5a75022266fdd94c4cf17d3 --- /dev/null +++ b/tests/exec_test/reparam/sisso.json @@ -0,0 +1,15 @@ +{ + "desc_dim": 2, + "n_sis_select": 10, + "max_rung": 1, + "n_residual": 1, + "data_file": "data.csv", + "property_key": "Prop", + "leave_out_frac": 0.05, + "n_rung_generate": 1, + "leave_out_inds": [], + "opset": ["add", "sub", "abs_diff", "mult", "div", "inv", "abs", "sq", "cb", "six_pow", "sqrt", "cbrt"], + "param_opset": ["log"], + "fix_intercept": true, + "reparam_residual": true +}