Skip to content

Commit

Permalink
Preserve original id column name
Browse files Browse the repository at this point in the history
closes #57

See also #36; the implementation needs to become column name agnostic to
avoid future issues like this
  • Loading branch information
Jotham Apaloo committed Dec 14, 2016
1 parent 0237f3f commit eb00876
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion data/forward_simulation_files/1049300.csv
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
,BA_Aw,BA_Pl,BA_Sb,BA_Sw,BAinc_Aw,BAinc_Pl,BAinc_Sb,BAinc_Sw,N0_Aw,N0_Pl,N0_Sb,N0_Sw,N_Aw,N_Pl,N_Sb,N_Sw,PlotID,SDF_Aw,SDF_Pl,SDF_Sb,SDF_Sw,SI_Aw,SI_Pl,SI_Sb,SI_Sw,StumpDOB_Aw,StumpDOB_Pl,StumpDOB_Sb,StumpDOB_Sw,StumpHeight_Aw,StumpHeight_Pl,StumpHeight_Sb,StumpHeight_Sw,TopDib_Aw,TopDib_Pl,TopDib_Sb,TopDib_Sw,tage_Aw,tage_Pl,tage_Sb,tage_Sw,topHeight_Aw,topHeight_Pl,topHeight_Sb,topHeight_Sw,y2bh_Aw,y2bh_Pl,y2bh_Sb,y2bh_Sw
,BA_Aw,BA_Pl,BA_Sb,BA_Sw,BAinc_Aw,BAinc_Pl,BAinc_Sb,BAinc_Sw,N0_Aw,N0_Pl,N0_Sb,N0_Sw,N_Aw,N_Pl,N_Sb,N_Sw,id_l1,SDF_Aw,SDF_Pl,SDF_Sb,SDF_Sw,SI_Aw,SI_Pl,SI_Sb,SI_Sw,StumpDOB_Aw,StumpDOB_Pl,StumpDOB_Sb,StumpDOB_Sw,StumpHeight_Aw,StumpHeight_Pl,StumpHeight_Sb,StumpHeight_Sw,TopDib_Aw,TopDib_Pl,TopDib_Sb,TopDib_Sw,tage_Aw,tage_Pl,tage_Sb,tage_Sw,topHeight_Aw,topHeight_Pl,topHeight_Sb,topHeight_Sw,y2bh_Aw,y2bh_Pl,y2bh_Sb,y2bh_Sw
1049300,0.8521579,13.97538956,0.0,2.21561054,-0.0424950404504,0.351131043839,0.0,0.0972881324137,161.979259557,3434.99283273,0.0,423.236991703,160.83938155,2637.76585742,0.0,418.18239203,1049300.0,160.4249489,2224.06815093,0.0,417.084487712,5.17907223875,7.79582393114,7.74932731593,6.57315576012,13.0,13.0,13.0,13.0,0.3,0.3,0.3,0.3,7.0,7.0,7.0,7.0,56.3514829555,37.0,0.0,44.5450327329,5.74141369555,5.74146899888,0.0,5.74137262923,12.365087301,12.2784422109,0.0,15.174260171
2 changes: 1 addition & 1 deletion data/forward_simulation_files/1168775.csv
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
,BA_Aw,BA_Pl,BA_Sb,BA_Sw,BAinc_Aw,BAinc_Pl,BAinc_Sb,BAinc_Sw,N0_Aw,N0_Pl,N0_Sb,N0_Sw,N_Aw,N_Pl,N_Sb,N_Sw,PlotID,SDF_Aw,SDF_Pl,SDF_Sb,SDF_Sw,SI_Aw,SI_Pl,SI_Sb,SI_Sw,StumpDOB_Aw,StumpDOB_Pl,StumpDOB_Sb,StumpDOB_Sw,StumpHeight_Aw,StumpHeight_Pl,StumpHeight_Sb,StumpHeight_Sw,TopDib_Aw,TopDib_Pl,TopDib_Sb,TopDib_Sw,tage_Aw,tage_Pl,tage_Sb,tage_Sw,topHeight_Aw,topHeight_Pl,topHeight_Sb,topHeight_Sw,y2bh_Aw,y2bh_Pl,y2bh_Sb,y2bh_Sw
,BA_Aw,BA_Pl,BA_Sb,BA_Sw,BAinc_Aw,BAinc_Pl,BAinc_Sb,BAinc_Sw,N0_Aw,N0_Pl,N0_Sb,N0_Sw,N_Aw,N_Pl,N_Sb,N_Sw,id_l1,SDF_Aw,SDF_Pl,SDF_Sb,SDF_Sw,SI_Aw,SI_Pl,SI_Sb,SI_Sw,StumpDOB_Aw,StumpDOB_Pl,StumpDOB_Sb,StumpDOB_Sw,StumpHeight_Aw,StumpHeight_Pl,StumpHeight_Sb,StumpHeight_Sw,TopDib_Aw,TopDib_Pl,TopDib_Sb,TopDib_Sw,tage_Aw,tage_Pl,tage_Sb,tage_Sw,topHeight_Aw,topHeight_Pl,topHeight_Sb,topHeight_Sw,y2bh_Aw,y2bh_Pl,y2bh_Sb,y2bh_Sw
1168775,0.0,12.566423,0.0,0.0,0.0,0.128407774876,0.0,0.0,0.0,815.875454847,0.0,0.0,0.0,812.809706,0.0,0.0,1168775.0,0.0,777.788346215,0.0,0.0,4.45795307528,7.184705996,7.35821183744,5.86425895536,13.0,13.0,13.0,13.0,0.3,0.3,0.3,0.3,7.0,7.0,7.0,7.0,0.0,19.0,0.0,0.0,0.0,2.2505309991,0.0,0.0,0.0,13.1155249122,0.0,0.0
2 changes: 1 addition & 1 deletion data/forward_simulation_files/1594749.csv
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
,BA_Aw,BA_Pl,BA_Sb,BA_Sw,BAinc_Aw,BAinc_Pl,BAinc_Sb,BAinc_Sw,N0_Aw,N0_Pl,N0_Sb,N0_Sw,N_Aw,N_Pl,N_Sb,N_Sw,PlotID,SDF_Aw,SDF_Pl,SDF_Sb,SDF_Sw,SI_Aw,SI_Pl,SI_Sb,SI_Sw,StumpDOB_Aw,StumpDOB_Pl,StumpDOB_Sb,StumpDOB_Sw,StumpHeight_Aw,StumpHeight_Pl,StumpHeight_Sb,StumpHeight_Sw,TopDib_Aw,TopDib_Pl,TopDib_Sb,TopDib_Sw,tage_Aw,tage_Pl,tage_Sb,tage_Sw,topHeight_Aw,topHeight_Pl,topHeight_Sb,topHeight_Sw,y2bh_Aw,y2bh_Pl,y2bh_Sb,y2bh_Sw
,BA_Aw,BA_Pl,BA_Sb,BA_Sw,BAinc_Aw,BAinc_Pl,BAinc_Sb,BAinc_Sw,N0_Aw,N0_Pl,N0_Sb,N0_Sw,N_Aw,N_Pl,N_Sb,N_Sw,id_l1,SDF_Aw,SDF_Pl,SDF_Sb,SDF_Sw,SI_Aw,SI_Pl,SI_Sb,SI_Sw,StumpDOB_Aw,StumpDOB_Pl,StumpDOB_Sb,StumpDOB_Sw,StumpHeight_Aw,StumpHeight_Pl,StumpHeight_Sb,StumpHeight_Sw,TopDib_Aw,TopDib_Pl,TopDib_Sb,TopDib_Sw,tage_Aw,tage_Pl,tage_Sb,tage_Sw,topHeight_Aw,topHeight_Pl,topHeight_Sb,topHeight_Sw,y2bh_Aw,y2bh_Pl,y2bh_Sb,y2bh_Sw
1594749,0.0,0.0,0.0,16.15,0.0,0.0,0.0,9.55156378219e-05,0.0,0.0,0.0,265.80607824,0.0,0.0,0.0,250.34,1594749.0,0.0,0.0,0.0,264.607607234,9.60171606637,10.7206260751,9.62120068807,9.98910008733,13.0,13.0,13.0,13.0,0.3,0.3,0.3,0.3,7.0,7.0,7.0,7.0,0.0,0.0,0.0,222.0,0.0,0.0,0.0,29.0700000259,0.0,0.0,0.0,11.1514166299
2 changes: 1 addition & 1 deletion data/forward_simulation_files/1614424_b.csv
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
,BA_Aw,BA_Pl,BA_Sb,BA_Sw,BAinc_Aw,BAinc_Pl,BAinc_Sb,BAinc_Sw,N0_Aw,N0_Pl,N0_Sb,N0_Sw,N_Aw,N_Pl,N_Sb,N_Sw,PlotID,SDF_Aw,SDF_Pl,SDF_Sb,SDF_Sw,SI_Aw,SI_Pl,SI_Sb,SI_Sw,StumpDOB_Aw,StumpDOB_Pl,StumpDOB_Sb,StumpDOB_Sw,StumpHeight_Aw,StumpHeight_Pl,StumpHeight_Sb,StumpHeight_Sw,TopDib_Aw,TopDib_Pl,TopDib_Sb,TopDib_Sw,tage_Aw,tage_Pl,tage_Sb,tage_Sw,topHeight_Aw,topHeight_Pl,topHeight_Sb,topHeight_Sw,y2bh_Aw,y2bh_Pl,y2bh_Sb,y2bh_Sw
,BA_Aw,BA_Pl,BA_Sb,BA_Sw,BAinc_Aw,BAinc_Pl,BAinc_Sb,BAinc_Sw,N0_Aw,N0_Pl,N0_Sb,N0_Sw,N_Aw,N_Pl,N_Sb,N_Sw,id_l1,SDF_Aw,SDF_Pl,SDF_Sb,SDF_Sw,SI_Aw,SI_Pl,SI_Sb,SI_Sw,StumpDOB_Aw,StumpDOB_Pl,StumpDOB_Sb,StumpDOB_Sw,StumpHeight_Aw,StumpHeight_Pl,StumpHeight_Sb,StumpHeight_Sw,TopDib_Aw,TopDib_Pl,TopDib_Sb,TopDib_Sw,tage_Aw,tage_Pl,tage_Sb,tage_Sw,topHeight_Aw,topHeight_Pl,topHeight_Sb,topHeight_Sw,y2bh_Aw,y2bh_Pl,y2bh_Sb,y2bh_Sw
1614424,7.20622386,2.62044504,0,1.0918521,-0.014453359,0.226709144,0,0.066310472,986.1432921,297.5380979,0,123.3075774,817.4665231,297.2605538,0,123.8585641,1614424,668.2299081,295.9631118,0,122.9372425,7.387892134,9.679708314,8.955013321,7.038138696,13,13,13,13,0.3,0.3,0.3,0.3,7,7,7,7,41,32.15577347,0,45.07509483,6.242792,6.242773758,0,6.242706892,8.680984364,10.25562169,0,14.44301041
2 changes: 1 addition & 1 deletion data/forward_simulation_files/613015.csv
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
,BA_Aw,BA_Pl,BA_Sb,BA_Sw,BAinc_Aw,BAinc_Pl,BAinc_Sb,BAinc_Sw,N0_Aw,N0_Pl,N0_Sb,N0_Sw,N_Aw,N_Pl,N_Sb,N_Sw,PlotID,SDF_Aw,SDF_Pl,SDF_Sb,SDF_Sw,SI_Aw,SI_Pl,SI_Sb,SI_Sw,StumpDOB_Aw,StumpDOB_Pl,StumpDOB_Sb,StumpDOB_Sw,StumpHeight_Aw,StumpHeight_Pl,StumpHeight_Sb,StumpHeight_Sw,TopDib_Aw,TopDib_Pl,TopDib_Sb,TopDib_Sw,tage_Aw,tage_Pl,tage_Sb,tage_Sw,topHeight_Aw,topHeight_Pl,topHeight_Sb,topHeight_Sw,y2bh_Aw,y2bh_Pl,y2bh_Sb,y2bh_Sw
,BA_Aw,BA_Pl,BA_Sb,BA_Sw,BAinc_Aw,BAinc_Pl,BAinc_Sb,BAinc_Sw,N0_Aw,N0_Pl,N0_Sb,N0_Sw,N_Aw,N_Pl,N_Sb,N_Sw,id_l1,SDF_Aw,SDF_Pl,SDF_Sb,SDF_Sw,SI_Aw,SI_Pl,SI_Sb,SI_Sw,StumpDOB_Aw,StumpDOB_Pl,StumpDOB_Sb,StumpDOB_Sw,StumpHeight_Aw,StumpHeight_Pl,StumpHeight_Sb,StumpHeight_Sw,TopDib_Aw,TopDib_Pl,TopDib_Sb,TopDib_Sw,tage_Aw,tage_Pl,tage_Sb,tage_Sw,topHeight_Aw,topHeight_Pl,topHeight_Sb,topHeight_Sw,y2bh_Aw,y2bh_Pl,y2bh_Sb,y2bh_Sw
613015,0.0,0.0,0.0,27.94,0.0,0.0,0.0,0.00785215834389,0.0,0.0,0.0,522.775958702,0.0,0.0,0.0,483.28,613015.0,0.0,0.0,0.0,516.350416832,8.84016746261,9.85887370769,9.06967917292,8.9870624508,13.0,13.0,13.0,13.0,0.3,0.3,0.3,0.3,7.0,7.0,7.0,7.0,0.0,0.0,0.0,148.0,0.0,0.0,0.0,22.3900000168,0.0,0.0,0.0,12.0725933017
2 changes: 1 addition & 1 deletion data/forward_simulation_files/763406.csv
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
,BA_Aw,BA_Pl,BA_Sb,BA_Sw,BAinc_Aw,BAinc_Pl,BAinc_Sb,BAinc_Sw,N0_Aw,N0_Pl,N0_Sb,N0_Sw,N_Aw,N_Pl,N_Sb,N_Sw,PlotID,SDF_Aw,SDF_Pl,SDF_Sb,SDF_Sw,SI_Aw,SI_Pl,SI_Sb,SI_Sw,StumpDOB_Aw,StumpDOB_Pl,StumpDOB_Sb,StumpDOB_Sw,StumpHeight_Aw,StumpHeight_Pl,StumpHeight_Sb,StumpHeight_Sw,TopDib_Aw,TopDib_Pl,TopDib_Sb,TopDib_Sw,tage_Aw,tage_Pl,tage_Sb,tage_Sw,topHeight_Aw,topHeight_Pl,topHeight_Sb,topHeight_Sw,y2bh_Aw,y2bh_Pl,y2bh_Sb,y2bh_Sw
,BA_Aw,BA_Pl,BA_Sb,BA_Sw,BAinc_Aw,BAinc_Pl,BAinc_Sb,BAinc_Sw,N0_Aw,N0_Pl,N0_Sb,N0_Sw,N_Aw,N_Pl,N_Sb,N_Sw,id_l1,SDF_Aw,SDF_Pl,SDF_Sb,SDF_Sw,SI_Aw,SI_Pl,SI_Sb,SI_Sw,StumpDOB_Aw,StumpDOB_Pl,StumpDOB_Sb,StumpDOB_Sw,StumpHeight_Aw,StumpHeight_Pl,StumpHeight_Sb,StumpHeight_Sw,TopDib_Aw,TopDib_Pl,TopDib_Sb,TopDib_Sw,tage_Aw,tage_Pl,tage_Sb,tage_Sw,topHeight_Aw,topHeight_Pl,topHeight_Sb,topHeight_Sw,y2bh_Aw,y2bh_Pl,y2bh_Sb,y2bh_Sw
763406,2.60200556,1.53754874,0.0,1.7740947,-0.00673674881487,0.171234794505,0.0,0.0928092465037,167.497574279,98.7132290146,0.0,113.987802092,167.05302064,98.71314856,0.0,113.8997868,763406.0,164.980043137,98.7082648369,0.0,113.848757859,7.26770159727,9.57754635768,8.88962966892,6.88068909243,13.0,13.0,13.0,13.0,0.3,0.3,0.3,0.3,7.0,7.0,7.0,7.0,33.0,27.1087754611,0.0,38.6009623,5.05769799922,5.05763494258,0.0,5.05773192084,8.82298658102,10.3827242693,0.0,14.68169146
6 changes: 3 additions & 3 deletions data/output/dataprepped_standtable.csv
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
,BA_Aw,BA_Pl,BA_Sb,BA_Sw,BAinc_Aw,BAinc_Pl,BAinc_Sb,BAinc_Sw,N0_Aw,N0_Pl,N0_Sb,N0_Sw,N_Aw,N_Pl,N_Sb,N_Sw,PlotID,SDF_Aw,SDF_Pl,SDF_Sb,SDF_Sw,SI_Aw,SI_Pl,SI_Sb,SI_Sw,StumpDOB_Aw,StumpDOB_Pl,StumpDOB_Sb,StumpDOB_Sw,StumpHeight_Aw,StumpHeight_Pl,StumpHeight_Sb,StumpHeight_Sw,TopDib_Aw,TopDib_Pl,TopDib_Sb,TopDib_Sw,tage_Aw,tage_Pl,tage_Sb,tage_Sw,topHeight_Aw,topHeight_Pl,topHeight_Sb,topHeight_Sw,y2bh_Aw,y2bh_Pl,y2bh_Sb,y2bh_Sw
1008174,0.0,0.0,0.0,17.78,0.0,0.0,0.0,0.0835972678741,0.0,0.0,0.0,769.007686168,0.0,0.0,0.0,732.71,1008174.0,0.0,0.0,0.0,757.654042978,7.32795845626,8.14768983209,7.97452149254,6.99731375824,13.0,13.0,13.0,13.0,0.3,0.3,0.3,0.3,7.0,7.0,7.0,7.0,0.0,0.0,0.0,100.0,0.0,0.0,0.0,13.9900000067,0.0,0.0,0.0,14.5041342157
1614424,7.20622386,2.62044504,0.0,1.0918521,0.154329535954,0.226709143188,0.0,0.0663104763957,964.419885613,297.538097939,0.0,124.05489652,817.46652306,297.26055384,0.0,123.8585641,1614424.0,682.8785575,295.963111781,0.0,123.81917531,7.38789213445,9.67970831428,8.95501332114,7.03813869613,13.0,13.0,13.0,13.0,0.3,0.3,0.3,0.3,7.0,7.0,7.0,7.0,41.0,32.1557734745,0.0,45.0750948321,6.24279199954,6.24277375764,0.0,6.24270689217,8.67714804702,10.2928455563,0.0,14.4430104134
,BA_Aw,BA_Pl,BA_Sb,BA_Sw,BAinc_Aw,BAinc_Pl,BAinc_Sb,BAinc_Sw,N0_Aw,N0_Pl,N0_Sb,N0_Sw,N_Aw,N_Pl,N_Sb,N_Sw,SDF_Aw,SDF_Pl,SDF_Sb,SDF_Sw,SI_Aw,SI_Pl,SI_Sb,SI_Sw,StumpDOB_Aw,StumpDOB_Pl,StumpDOB_Sb,StumpDOB_Sw,StumpHeight_Aw,StumpHeight_Pl,StumpHeight_Sb,Stumpheight_Sw,TopDib_Aw,TopDib_Pl,TopDib_Sb,TopDib_Sw,id_l1,tage_Aw,tage_Pl,tage_Sb,tage_Sw,topHeight_Aw,topHeight_Pl,topHeight_Sb,topHeight_Sw,y2bh_Aw,y2bh_Pl,y2bh_Sb,y2bh_Sw
1008174,0.0,0.0,0.0,17.78,0.0,0.0,0.0,0.0835972678741,0.0,0.0,0.0,769.007686168,0.0,0.0,0.0,732.71,0.0,0.0,0.0,757.654042978,7.32795845626,8.14768983209,7.97452149254,6.99731375824,13.0,13.0,13.0,13.0,0.3,0.3,0.3,0.3,7.0,7.0,7.0,7.0,1008174.0,0.0,0.0,0.0,100.0,0.0,0.0,0.0,13.9900000067,0.0,0.0,0.0,14.5041342157
1614424,7.20622386,2.62044504,0.0,1.0918521,0.154329535975,0.226709143181,0.0,0.0663104763965,964.419885613,297.538097939,0.0,124.05489652,817.46652306,297.26055384,0.0,123.8585641,682.8785575,295.963111781,0.0,123.81917531,7.38789213445,9.67970831428,8.95501332114,7.03813869613,13.0,13.0,13.0,13.0,0.3,0.3,0.3,0.3,7.0,7.0,7.0,7.0,1614424.0,41.0,32.1557734745,0.0,45.0750948321,6.24279199954,6.24277375764,0.0,6.24270689217,8.67714804702,10.2928455563,0.0,14.4430104134
2 changes: 1 addition & 1 deletion data/raw_standtable_prepped.csv
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
,BA_Aw,BA_Pl,BA_Sb,BA_Sw,BAinc_Aw,BAinc_Pl,BAinc_Sb,BAinc_Sw,N0_Aw,N0_Pl,N0_Sb,N0_Sw,N_Aw,N_Pl,N_Sb,N_Sw,PlotID,SDF_Aw,SDF_Pl,SDF_Sb,SDF_Sw,SI_Aw,SI_Pl,SI_Sb,SI_Sw,StumpDOB_Aw,StumpDOB_Pl,StumpDOB_Sb,StumpDOB_Sw,StumpHeight_Aw,StumpHeight_Pl,StumpHeight_Sb,Stumpheight_Sw,TopDib_Aw,TopDib_Pl,TopDib_Sb,TopDib_Sw,tage_Aw,tage_Pl,tage_Sb,tage_Sw,topHeight_Aw,topHeight_Pl,topHeight_Sb,topHeight_Sw,y2bh_Aw,y2bh_Pl,y2bh_Sb,y2bh_Sw
,BA_Aw,BA_Pl,BA_Sb,BA_Sw,BAinc_Aw,BAinc_Pl,BAinc_Sb,BAinc_Sw,N0_Aw,N0_Pl,N0_Sb,N0_Sw,N_Aw,N_Pl,N_Sb,N_Sw,id_l1,SDF_Aw,SDF_Pl,SDF_Sb,SDF_Sw,SI_Aw,SI_Pl,SI_Sb,SI_Sw,StumpDOB_Aw,StumpDOB_Pl,StumpDOB_Sb,StumpDOB_Sw,StumpHeight_Aw,StumpHeight_Pl,StumpHeight_Sb,Stumpheight_Sw,TopDib_Aw,TopDib_Pl,TopDib_Sb,TopDib_Sw,tage_Aw,tage_Pl,tage_Sb,tage_Sw,topHeight_Aw,topHeight_Pl,topHeight_Sb,topHeight_Sw,y2bh_Aw,y2bh_Pl,y2bh_Sb,y2bh_Sw
1008174,0.0,0.0,0.0,17.78,0.0,0.0,0.0,0.0835972678741,0.0,0.0,0.0,769.007686168,0.0,0.0,0.0,732.71,1008174.0,0.0,0.0,0.0,757.654042978,7.32795845626,8.14768983209,7.97452149254,6.99731375824,13.0,13.0,13.0,13.0,0.3,0.3,0.3,0.3,7.0,7.0,7.0,7.0,0.0,0.0,0.0,100.0,0.0,0.0,0.0,13.9900000067,0.0,0.0,0.0,14.5041342157
1614424,7.20622386,2.62044504,0.0,1.0918521,0.154329535975,0.226709143181,0.0,0.0663104763965,964.419885613,297.538097939,0.0,124.05489652,817.46652306,297.26055384,0.0,123.8585641,1614424.0,682.8785575,295.963111781,0.0,123.81917531,7.38789213445,9.67970831428,8.95501332114,7.03813869613,13.0,13.0,13.0,13.0,0.3,0.3,0.3,0.3,7.0,7.0,7.0,7.0,41.0,32.1557734745,0.0,45.0750948321,6.24279199954,6.24277375764,0.0,6.24270689217,8.67714804702,10.2928455563,0.0,14.4430104134
2 changes: 1 addition & 1 deletion pygypsy/data_prep.py
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ def sort_species(species_perc_list, species_perc_dict={'Aw':0, 'Pl':0, 'Sw':0, '
top_dib_pl = sp_pl[9]

PLOT_DICT[plot_id] = {
'PlotID': plot_id,
'id_l1': plot_id,
'SI_Aw': site_index_white_aspen,
'SI_Sw': site_index_sw,
'SI_Pl': site_index_pl,
Expand Down
2 changes: 1 addition & 1 deletion pygypsy/forward_simulation.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ def simulate_forwards_df(plot_df, simulation_choice='yes',
for _, row in plot_df.iterrows():
start = datetime.datetime.now()
_log_loop_progress(_, n_rows)
plot_id = str(int(row['PlotID']))
plot_id = str(int(row['id_l1']))

logger.info('Starting simulation for plot: %s', plot_id)
SI_bh_Aw = row.at['SI_Aw']
Expand Down
2 changes: 1 addition & 1 deletion tests/test_simulation_forward.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def test_compare_forward_simulation(test_file):
'comparisons_{}'.format(os.path.basename(test_file))
)

plot_id = str(int(input_df.loc[0, 'PlotID']))
plot_id = str(int(input_df.loc[0, 'id_l1']))

result = simulate_forwards_df(input_df, simulation_choice='yes')[plot_id]
expected = pd.read_csv(expected_data_path, index_col=0)
Expand Down

0 comments on commit eb00876

Please sign in to comment.