Skip to content

Commit

Permalink
trying to join files independent of os slashes
Browse files Browse the repository at this point in the history
  • Loading branch information
K20shores committed Jul 5, 2024
1 parent 06c3c8f commit 38b9b40
Show file tree
Hide file tree
Showing 3 changed files with 104 additions and 7 deletions.
5 changes: 0 additions & 5 deletions requirements.txt

This file was deleted.

4 changes: 2 additions & 2 deletions src/acom_music_box/music_box_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@ def main():
logger.info("myBox = {}".format(myBox))

# create solver and solve, writing output to requested directory
campConfig = os.path.dirname(musicBoxConfigFile) + "\\" + myBox.config_file
campConfig = os.path.join(os.path.dirname(musicBoxConfigFile), myBox.config_file)
logger.info("CAMP config = {}".format(campConfig))
myBox.create_solver(campConfig)
logger.info("myBox.solver = {}".format(myBox.solver))
mySolution = myBox.solve(musicBoxOutputDir + "\\my_solution.csv")
mySolution = myBox.solve(os.path.join(musicBoxOutputDir, "mySolution.csv"))
logger.info("mySolution = {}".format(mySolution))

logger.info("End time: {}".format(datetime.datetime.now()))
Expand Down
102 changes: 102 additions & 0 deletions tests/configs/analytical_config/mySolution.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
time,ENV.temperature,ENV.pressure,CONC.A,CONC.B,CONC.C,CONC.irr__089f1f45-4cd8-4278-83d5-d638e98e4315,CONC.irr__2a109b21-bb24-41ae-8f06-7485fd36f1a7
0,272.5,101253.3,1.0,0.0,0.0,0,0
1.0,272.5,101253.3,0.99520593465931,4.185861830820349e-09,0.004794061154828245,0.004794061154828245,0.004794065340690076
2.0,272.5,101253.3,0.9904348523811104,4.165794535696295e-09,0.00956514345309481,0.00956514345309481,0.009565147618889342
3.0,272.5,101253.3,0.9856866429830988,4.145823444496284e-09,0.014313352871077673,0.014313352871077673,0.014313357016901116
4.0,272.5,101253.3,0.9809611968111925,4.1259480960124e-09,0.019038799062859456,0.019038799062859456,0.019038803188807546
5.0,272.5,101253.3,0.9762584047369978,4.106168031247816e-09,0.02374159115683391,0.02374159115683391,0.02374159526300195
6.0,272.5,101253.3,0.9715781581552905,4.0864827934061606e-09,0.02842183775822617,0.02842183775822617,0.028421841844708976
7.0,272.5,101253.3,0.9669203489815065,4.0668919278809675e-09,0.03307964695160082,0.03307964695160082,0.033079651018492764
8.0,272.5,101253.3,0.9622848696492461,4.047394982245179e-09,0.03771512630335798,0.03771512630335798,0.03771513035075297
9.0,272.5,101253.3,0.9576716131077901,4.027991506240713e-09,0.042328382864217376,0.042328382864217376,0.042328386892208886
10.0,272.5,101253.3,0.9530804728196274,4.008681051768048e-09,0.046919523171690625,0.046919523171690625,0.0469195271803717
11.0,272.5,101253.3,0.9485113427579942,3.989463172875885e-09,0.05148865325254157,0.05148865325254157,0.05148865724200479
12.0,272.5,101253.3,0.9439641174044264,3.970337425750849e-09,0.056035878625234826,0.056035878625234826,0.056035882595572295
13.0,272.5,101253.3,0.9394386917463227,3.951303368707209e-09,0.060561304302372554,0.060561304302372554,0.06056130825367594
14.0,272.5,101253.3,0.9349349612745184,3.932360562176736e-09,0.06506503479311962,0.06506503479311962,0.06506503872548021
15.0,272.5,101253.3,0.9304528219808726,3.91350856869851e-09,0.06954717410561721,0.06954717410561721,0.0695471780191258
16.0,272.5,101253.3,0.9259921703558669,3.8947469529088136e-09,0.07400782574938462,0.07400782574938462,0.07400782964413159
17.0,272.5,101253.3,0.9215529033862137,3.876075281531118e-09,0.07844709273770972,0.07844709273770972,0.07844709661378503
18.0,272.5,101253.3,0.9171349185524774,3.857493123366026e-09,0.08286507759002802,0.08286507759002802,0.08286508144752125
19.0,272.5,101253.3,0.9127381138267081,3.8390000492813435e-09,0.08726188233429015,0.08726188233429015,0.0872618861732903
20.0,272.5,101253.3,0.9083623876700847,3.820595632202178e-09,0.09163760850931801,0.09163760850931801,0.09163761232991373
21.0,272.5,101253.3,0.9040076390305691,3.80227944710104e-09,0.09599235716714982,0.09599235716714982,0.09599236096942938
22.0,272.5,101253.3,0.8996737673405735,3.784051070988079e-09,0.10032622887537379,0.10032622887537379,0.10032623265942492
23.0,272.5,101253.3,0.895360672514638,3.765910082901255e-09,0.10463932371945028,0.10463932371945028,0.10463932748536042
24.0,272.5,101253.3,0.8910682549471185,3.747856063896665e-09,0.1089317413050237,0.1089317413050237,0.10893174505287984
25.0,272.5,101253.3,0.8867964155098874,3.729888597038841e-09,0.11320358076022234,0.11320358076022234,0.113203584490111
26.0,272.5,101253.3,0.8825450555500433,3.7120072673911393e-09,0.11745494073794784,0.11745494073794784,0.11745494444995518
27.0,272.5,101253.3,0.8783140768876333,3.6942116620061493e-09,0.1216859194181533,0.1216859194181533,0.12168592311236505
28.0,272.5,101253.3,0.8741033818133861,3.6765013699161524e-09,0.1258966145101108,0.1258966145101108,0.1258966181866122
29.0,272.5,101253.3,0.8699128730864545,3.6588759821236406e-09,0.13008712325466773,0.13008712325466773,0.1300871269135438
30.0,272.5,101253.3,0.8657424539321708,3.6413350915918595e-09,0.1342575424264925,0.1342575424264925,0.13425754606782778
31.0,272.5,101253.3,0.8615920280398103,3.6238782932354216e-09,0.13840796833630947,0.13840796833630947,0.13840797196018786
32.0,272.5,101253.3,0.8574614995603698,3.6065051839109433e-09,0.14253849683312306,0.14253849683312306,0.14253850043962837
33.0,272.5,101253.3,0.853350773104351,3.5892153624077306e-09,0.14664922330643138,0.14664922330643138,0.14664922689564688
34.0,272.5,101253.3,0.8492597537395602,3.572008429438537e-09,0.15074024268842892,0.15074024268842892,0.15074024626043753
35.0,272.5,101253.3,0.8451883469889142,3.5548839876303093e-09,0.15481164945619919,0.15481164945619919,0.1548116530110834
36.0,272.5,101253.3,0.8411364588282593,3.5378416415150443e-09,0.15886353763389616,0.15886353763389616,0.15886354117173812
37.0,272.5,101253.3,0.8371039956841999,3.5208809975206054e-09,0.16289600079491617,0.16289600079491617,0.16289600431579745
38.0,272.5,101253.3,0.8330908644319373,3.5040016639616937e-09,0.1669091320640583,0.1669091320640583,0.16690913556806028
39.0,272.5,101253.3,0.8290969723931183,3.487203251030774e-09,0.1709030241196754,0.1709030241196754,0.17090302760687906
40.0,272.5,101253.3,0.8251222273336972,3.4704853707890645e-09,0.17487776919581424,0.17487776919581424,0.17487777266629986
41.0,272.5,101253.3,0.8211665374618037,3.4538476371575918e-09,0.17883345908434545,0.17883345908434545,0.17883346253819332
42.0,272.5,101253.3,0.8172298114256233,3.4372896659082723e-09,0.18277018513708354,0.18277018513708354,0.18277018857437338
43.0,272.5,101253.3,0.8133119583112889,3.4208110746550295e-09,0.18668803826789643,0.18668803826789643,0.18668804168870767
44.0,272.5,101253.3,0.8094128876407799,3.4044114828449734e-09,0.19058710895480485,0.19058710895480485,0.19058711235921652
45.0,272.5,101253.3,0.8055325093698334,3.3880905117496194e-09,0.19446748724207236,0.19446748724207236,0.19446749063016303
46.0,272.5,101253.3,0.8016707338858646,3.371847784456122e-09,0.1983292627422841,0.1983292627422841,0.198329266114132
47.0,272.5,101253.3,0.7978274720058968,3.3556829258585765e-09,0.20217252463841676,0.20217252463841676,0.20217252799409985
48.0,272.5,101253.3,0.7940026349745031,3.3395955626493747e-09,0.20599736168589794,0.20599736168589794,0.2059973650254937
49.0,272.5,101253.3,0.790196134461755,3.323585323310557e-09,0.20980386221465597,0.20980386221465597,0.2098038655382416
50.0,272.5,101253.3,0.7864078825611847,3.3076518381052446e-09,0.21359211413115983,0.21359211413115983,0.21359211743881198
51.0,272.5,101253.3,0.7826377917877527,3.2917947390691144e-09,0.217362204920449,0.217362204920449,0.21736220821224403
52.0,272.5,101253.3,0.7788857750758286,3.2760136600018768e-09,0.22111422164815392,0.22111422164815392,0.22111422492416788
53.0,272.5,101253.3,0.7751517457771812,3.2603082364588376e-09,0.22484825096250685,0.22484825096250685,0.22484825422281549
54.0,272.5,101253.3,0.7714356176589754,3.2446781057424642e-09,0.2285643790963427,0.2285643790963427,0.22856438234102125
55.0,272.5,101253.3,0.7677373049017828,3.2291229068940254e-09,0.23226269186909065,0.23226269186909065,0.23226269509821404
56.0,272.5,101253.3,0.7640567220975983,3.2136422806852574e-09,0.23594327468875573,0.23594327468875573,0.23594327790239852
57.0,272.5,101253.3,0.760393784247869,3.1982358696100475e-09,0.23960621255389142,0.23960621255389142,0.23960621575212795
58.0,272.5,101253.3,0.7567484067615302,3.182903317876199e-09,0.24325159005556293,0.24325159005556293,0.24325159323846685
59.0,272.5,101253.3,0.7531205054530523,3.167644271397205e-09,0.2468794913792999,0.2468794913792999,0.24687949454694474
60.0,272.5,101253.3,0.7495099965404972,3.152458377784061e-09,0.2504900003070413,0.2504900003070413,0.2504900034595003
61.0,272.5,101253.3,0.7459167966435816,3.137345286337157e-09,0.25408320021906994,0.25408320021906994,0.2540832033564158
62.0,272.5,101253.3,0.7423408227817538,3.1223046480381498e-09,0.2576591740959382,0.2576591740959382,0.25765917721824333
63.0,272.5,101253.3,0.7387819923722766,3.1073361155419203e-09,0.26121800452038413,0.26121800452038413,0.26121800762772074
64.0,272.5,101253.3,0.7352402232283186,3.092439343168522e-09,0.2647597736792388,0.2647597736792388,0.2647597767716788
65.0,272.5,101253.3,0.7317154335570585,3.077613986895251e-09,0.2682845633653244,0.2682845633653244,0.26828456644293885
66.0,272.5,101253.3,0.7282075419577947,3.0628597043486562e-09,0.27179245497934257,0.27179245497934257,0.27179245804220287
67.0,272.5,101253.3,0.7247164674200656,3.048176154796643e-09,0.27528352953175506,0.27528352953175506,0.27528353257993193
68.0,272.5,101253.3,0.7212421293217794,3.0335629991406108e-09,0.27875786764465416,0.27875786764465416,0.2787578706782178
69.0,272.5,101253.3,0.7177844474273526,3.019019899907628e-09,0.28221554955362427,0.28221554955362427,0.28221555257264486
70.0,272.5,101253.3,0.7143433418858546,3.004546521242631e-09,0.2856566551095955,0.2856566551095955,0.28565665811414265
71.0,272.5,101253.3,0.7109187332291669,2.9901425289006514e-09,0.2890812637806872,0.2890812637806872,0.28908126677083035
72.0,272.5,101253.3,0.7075105423701459,2.9758075902391244e-09,0.2924894546540436,0.2924894546540436,0.29248945762985157
73.0,272.5,101253.3,0.7041186906007961,2.961541374210199e-09,0.2958813064376595,0.2958813064376595,0.2958813093992011
74.0,272.5,101253.3,0.7007430995904546,2.9473435513530737e-09,0.2992568974621985,0.2992568974621985,0.2992569004095426
75.0,272.5,101253.3,0.6973836913839803,2.9332137937864252e-09,0.30261630568280257,0.30261630568280257,0.30261630861601696
76.0,272.5,101253.3,0.6940403883999539,2.919151775200801e-09,0.30595960868089106,0.30595960868089106,0.3059596116000434
77.0,272.5,101253.3,0.6907131134288864,2.9051571708510976e-09,0.30928688366595297,0.30928688366595297,0.30928688657111086
78.0,272.5,101253.3,0.6874017896314368,2.8912296575490617e-09,0.31259820747732997,0.31259820747732997,0.3125982103685604
79.0,272.5,101253.3,0.6841063405366362,2.8773689136558325e-09,0.31589365658599117,0.31589365658599117,0.31589365946336095
80.0,272.5,101253.3,0.6808266900401231,2.863574619074495e-09,0.31917330709629854,0.31917330709629854,0.3191733099598739
81.0,272.5,101253.3,0.6775627624023852,2.84984645524271e-09,0.32243723474776487,0.32243723474776487,0.322437237597612
82.0,272.5,101253.3,0.6743144822470097,2.8361841051253398e-09,0.32568551491680264,0.32568551491680264,0.32568551775298765
83.0,272.5,101253.3,0.6710817745589438,2.822587253207142e-09,0.3289182226184654,0.3289182226184654,0.3289182254410533
84.0,272.5,101253.3,0.6678645646827618,2.8090555854854676e-09,0.3321354325081788,0.3321354325081788,0.3321354353172351
85.0,272.5,101253.3,0.6646627783209411,2.7955887894630225e-09,0.33533721888346624,0.33533721888346624,0.3353372216790558
86.0,272.5,101253.3,0.661476341532146,2.782186554140638e-09,0.33852365568566367,0.33852365568566367,0.33852365846785093
87.0,272.5,101253.3,0.6583051807295199,2.7688485700100912e-09,0.3416948165016275,0.3416948165016275,0.34169481927047657
88.0,272.5,101253.3,0.6551492226789877,2.7555745290469878e-09,0.3448507745654336,0.3448507745654336,0.3448507773210087
89.0,272.5,101253.3,0.6520083944975624,2.7423641247035965e-09,0.3479916027600695,0.3479916027600695,0.34799160550243413
90.0,272.5,101253.3,0.6488826236516624,2.729217051901803e-09,0.3511173736191165,0.3511173736191165,0.3511173763483338
91.0,272.5,101253.3,0.6457718379554379,2.7161330070260576e-09,0.3542281593284249,0.3542281593284249,0.35422816204455826
92.0,272.5,101253.3,0.6426759655691022,2.7031116879163706e-09,0.3573240317277821,0.3573240317277821,0.3573240344308941
93.0,272.5,101253.3,0.6395949349972728,2.6901527938613176e-09,0.3604050623125703,0.3604050623125703,0.3604050650027234
94.0,272.5,101253.3,0.6365286750873215,2.6772560255911065e-09,0.36347132223541834,0.36347132223541834,0.3634713249126747
95.0,272.5,101253.3,0.6334771150277297,2.6644210852706663e-09,0.36652288230784486,0.36652288230784486,0.3665228849722662
96.0,272.5,101253.3,0.630440184346455,2.6516476764927646e-09,0.3695598130018932,0.3695598130018932,0.369559815653541
97.0,272.5,101253.3,0.6274178129093014,2.6389355042711705e-09,0.37258218445175906,0.37258218445175906,0.3725821870906945
98.0,272.5,101253.3,0.6244099309183017,2.6262842750338274e-09,0.3755900664554104,0.3755900664554104,0.3755900690816947
99.0,272.5,101253.3,0.6214164689101035,2.6136936966160904e-09,0.378583528476199,0.378583528476199,0.37858353108989273
100.0,272.5,101253.3,0.6184373577543674,2.6011634782539623e-09,0.38156263964446524,0.38156263964446524,0.38156264224562875

0 comments on commit 38b9b40

Please sign in to comment.