Skip to content

Commit

Permalink
[HOT FIX]
Browse files Browse the repository at this point in the history 
- Compatibility with pandas .25
  • Loading branch information
@Leguark
Leguark committed Aug 9, 2019
1 parent d88eb5e commit 6586332
Show file tree
Hide file tree
Showing 9 changed files with 689 additions and 1,702 deletions.
8 changes: 1 addition & 7 deletions gempy/core/data.py
View file
Expand Up @@ -1233,23 +1233,17 @@ def map_data_from_series(self, series, attribute: str, idx=None):
"""
if idx is None:
idx = self.df.index
print(type(series.df[attribute].dtype))
print(type(series.df[attribute].dtype))
print('foo', self.df.loc[idx, attribute])

idx = np.atleast_1d(idx)
print(attribute in ['id', 'order_series'], attribute)
if attribute in ['id', 'order_series']:
self.df.loc[idx, attribute] = self.df['series'].map(series.df[attribute]).astype(int)

else:
print('fuafuapg')
self.df.loc[idx, attribute] = self.df['series'].map(series.df[attribute])
print(type(self.df['order_series'].dtype))

if type(self.df['order_series'].dtype) is pn.CategoricalDtype:

self.df['order_series'].cat.remove_unused_categories(inplace=True)
print(self.df['order_series'])
return self

@setdoc_pro(Surfaces.__doc__)
Expand Down
2 changes: 1 addition & 1 deletion gempy/core/model.py
View file
Expand Up @@ -946,7 +946,7 @@ def set_surface_order_from_solution(self):
pn.DataFrame(sfai_order, index=surface_names)[0])

except IndexError:
print('foo')
pass # print('foo')

self.surfaces.sort_surfaces()
self.surfaces.set_basement()
Expand Down
2 changes: 1 addition & 1 deletion gempy/plot/visualization_3d.py
View file
Expand Up @@ -93,7 +93,7 @@ def __init__(self, geo_data, ren_name='GemPy 3D-Editor', verbose=0, real_time=Fa
self.ren_name = ren_name
# Number of renders
self.n_ren = 4
self.id = geo_data.surface_points.df['id'].cat.categories
self.id = geo_data.surface_points.df['id'].unique()
self.surface_name = geo_data.surface_points.df['surface'].unique()

# Extents
Expand Down
104 changes: 52 additions & 52 deletions notebooks/data/gempy_models/Tutorial_ch1-1_Basics/Tutorial_ch1-1_Basics_surface_points.csv
View file
Expand Up @@ -4,55 +4,55 @@
54,500,1000,300,0.40799473684210524,0.5001,0.34220526315789473,Main_Fault,Fault_Series,1,1,1e-08
55,800,1000,1200,0.4869421052631579,0.5001,0.5790473684210526,Main_Fault,Fault_Series,1,1,1e-08
56,900,1000,1500,0.5132578947368421,0.5001,0.6579947368421053,Main_Fault,Fault_Series,1,1,1e-08
0,800,50,750,0.4869421052631579,0.2501,0.46062631578947366,Shale,Strat_Series,3,2,1e-08
1,800,150,700,0.4869421052631579,0.27641578947368417,0.44746842105263157,Shale,Strat_Series,3,2,1e-08
2,800,300,700,0.4869421052631579,0.3158894736842105,0.44746842105263157,Shale,Strat_Series,3,2,1e-08
3,800,500,800,0.4869421052631579,0.36852105263157897,0.4737842105263158,Shale,Strat_Series,3,2,1e-08
4,800,1000,1000,0.4869421052631579,0.5001,0.5264157894736842,Shale,Strat_Series,3,2,1e-08
5,800,1500,700,0.4869421052631579,0.631678947368421,0.44746842105263157,Shale,Strat_Series,3,2,1e-08
6,800,1700,600,0.4869421052631579,0.6843105263157895,0.42115263157894733,Shale,Strat_Series,3,2,1e-08
7,800,1950,650,0.4869421052631579,0.7501,0.4343105263157895,Shale,Strat_Series,3,2,1e-08
8,0,1000,1100,0.27641578947368417,0.5001,0.5527315789473684,Shale,Strat_Series,3,2,1e-08
9,300,1000,1000,0.3553631578947368,0.5001,0.5264157894736842,Shale,Strat_Series,3,2,1e-08
10,450,1000,950,0.39483684210526315,0.5001,0.5132578947368421,Shale,Strat_Series,3,2,1e-08
11,1100,1000,900,0.5658894736842105,0.5001,0.5001,Shale,Strat_Series,3,2,1e-08
12,1400,1000,850,0.6448368421052632,0.5001,0.4869421052631579,Shale,Strat_Series,3,2,1e-08
13,1700,1000,900,0.7237842105263158,0.5001,0.5001,Shale,Strat_Series,3,2,1e-08
14,1500,500,800,0.6711526315789473,0.36852105263157897,0.4737842105263158,Shale,Strat_Series,3,2,1e-08
15,1500,1500,750,0.6711526315789473,0.631678947368421,0.46062631578947366,Shale,Strat_Series,3,2,1e-08
16,800,50,450,0.4869421052631579,0.2501,0.38167894736842106,Sandstone_1,Strat_Series,2,2,1e-08
17,800,150,400,0.4869421052631579,0.27641578947368417,0.36852105263157897,Sandstone_1,Strat_Series,2,2,1e-08
18,800,300,400,0.4869421052631579,0.3158894736842105,0.36852105263157897,Sandstone_1,Strat_Series,2,2,1e-08
19,800,500,500,0.4869421052631579,0.36852105263157897,0.39483684210526315,Sandstone_1,Strat_Series,2,2,1e-08
20,800,1000,700,0.4869421052631579,0.5001,0.44746842105263157,Sandstone_1,Strat_Series,2,2,1e-08
21,800,1500,400,0.4869421052631579,0.631678947368421,0.36852105263157897,Sandstone_1,Strat_Series,2,2,1e-08
22,800,1700,300,0.4869421052631579,0.6843105263157895,0.34220526315789473,Sandstone_1,Strat_Series,2,2,1e-08
23,800,1950,350,0.4869421052631579,0.7501,0.3553631578947368,Sandstone_1,Strat_Series,2,2,1e-08
24,0,1000,800,0.27641578947368417,0.5001,0.4737842105263158,Sandstone_1,Strat_Series,2,2,1e-08
25,300,1000,700,0.3553631578947368,0.5001,0.44746842105263157,Sandstone_1,Strat_Series,2,2,1e-08
26,1100,1000,600,0.5658894736842105,0.5001,0.42115263157894733,Sandstone_1,Strat_Series,2,2,1e-08
27,1400,1000,550,0.6448368421052632,0.5001,0.40799473684210524,Sandstone_1,Strat_Series,2,2,1e-08
28,1700,1000,600,0.7237842105263158,0.5001,0.42115263157894733,Sandstone_1,Strat_Series,2,2,1e-08
29,1500,500,500,0.6711526315789473,0.36852105263157897,0.39483684210526315,Sandstone_1,Strat_Series,2,2,1e-08
30,1500,1500,450,0.6711526315789473,0.631678947368421,0.38167894736842106,Sandstone_1,Strat_Series,2,2,1e-08
31,900,150,920,0.5132578947368421,0.27641578947368417,0.5053631578947368,Siltstone,Strat_Series,5,2,1e-08
32,900,300,920,0.5132578947368421,0.3158894736842105,0.5053631578947368,Siltstone,Strat_Series,5,2,1e-08
33,900,1500,920,0.5132578947368421,0.631678947368421,0.5053631578947368,Siltstone,Strat_Series,5,2,1e-08
34,900,1700,820,0.5132578947368421,0.6843105263157895,0.4790473684210526,Siltstone,Strat_Series,5,2,1e-08
35,900,1950,870,0.5132578947368421,0.7501,0.4922052631578947,Siltstone,Strat_Series,5,2,1e-08
36,0,1000,1300,0.27641578947368417,0.5001,0.6053631578947368,Siltstone,Strat_Series,5,2,1e-08
37,300,1000,1200,0.3553631578947368,0.5001,0.5790473684210526,Siltstone,Strat_Series,5,2,1e-08
38,600,1000,1100,0.4343105263157895,0.5001,0.5527315789473684,Siltstone,Strat_Series,5,2,1e-08
39,1100,1000,1100,0.5658894736842105,0.5001,0.5527315789473684,Siltstone,Strat_Series,5,2,1e-08
40,1400,1000,1050,0.6448368421052632,0.5001,0.5395736842105263,Siltstone,Strat_Series,5,2,1e-08
41,1700,1000,1100,0.7237842105263158,0.5001,0.5527315789473684,Siltstone,Strat_Series,5,2,1e-08
42,1500,500,1000,0.6711526315789473,0.36852105263157897,0.5264157894736842,Siltstone,Strat_Series,5,2,1e-08
43,1500,1500,950,0.6711526315789473,0.631678947368421,0.5132578947368421,Siltstone,Strat_Series,5,2,1e-08
44,0,1000,1500,0.27641578947368417,0.5001,0.6579947368421053,Sandstone_2,Strat_Series,4,2,1e-08
45,300,1000,1400,0.3553631578947368,0.5001,0.631678947368421,Sandstone_2,Strat_Series,4,2,1e-08
46,600,1000,1300,0.4343105263157895,0.5001,0.6053631578947368,Sandstone_2,Strat_Series,4,2,1e-08
47,1100,1000,1300,0.5658894736842105,0.5001,0.6053631578947368,Sandstone_2,Strat_Series,4,2,1e-08
48,1400,1000,1250,0.6448368421052632,0.5001,0.5922052631578947,Sandstone_2,Strat_Series,4,2,1e-08
49,1700,1000,1300,0.7237842105263158,0.5001,0.6053631578947368,Sandstone_2,Strat_Series,4,2,1e-08
50,1500,500,1200,0.6711526315789473,0.36852105263157897,0.5790473684210526,Sandstone_2,Strat_Series,4,2,1e-08
51,1500,1500,1150,0.6711526315789473,0.631678947368421,0.5658894736842105,Sandstone_2,Strat_Series,4,2,1e-08
44,0,1000,1500,0.27641578947368417,0.5001,0.6579947368421053,Sandstone_2,Strat_Series,2,2,1e-08
45,300,1000,1400,0.3553631578947368,0.5001,0.631678947368421,Sandstone_2,Strat_Series,2,2,1e-08
46,600,1000,1300,0.4343105263157895,0.5001,0.6053631578947368,Sandstone_2,Strat_Series,2,2,1e-08
47,1100,1000,1300,0.5658894736842105,0.5001,0.6053631578947368,Sandstone_2,Strat_Series,2,2,1e-08
48,1400,1000,1250,0.6448368421052632,0.5001,0.5922052631578947,Sandstone_2,Strat_Series,2,2,1e-08
49,1700,1000,1300,0.7237842105263158,0.5001,0.6053631578947368,Sandstone_2,Strat_Series,2,2,1e-08
50,1500,500,1200,0.6711526315789473,0.36852105263157897,0.5790473684210526,Sandstone_2,Strat_Series,2,2,1e-08
51,1500,1500,1150,0.6711526315789473,0.631678947368421,0.5658894736842105,Sandstone_2,Strat_Series,2,2,1e-08
31,900,150,920,0.5132578947368421,0.27641578947368417,0.5053631578947368,Siltstone,Strat_Series,3,2,1e-08
32,900,300,920,0.5132578947368421,0.3158894736842105,0.5053631578947368,Siltstone,Strat_Series,3,2,1e-08
33,900,1500,920,0.5132578947368421,0.631678947368421,0.5053631578947368,Siltstone,Strat_Series,3,2,1e-08
34,900,1700,820,0.5132578947368421,0.6843105263157895,0.4790473684210526,Siltstone,Strat_Series,3,2,1e-08
35,900,1950,870,0.5132578947368421,0.7501,0.4922052631578947,Siltstone,Strat_Series,3,2,1e-08
36,0,1000,1300,0.27641578947368417,0.5001,0.6053631578947368,Siltstone,Strat_Series,3,2,1e-08
37,300,1000,1200,0.3553631578947368,0.5001,0.5790473684210526,Siltstone,Strat_Series,3,2,1e-08
38,600,1000,1100,0.4343105263157895,0.5001,0.5527315789473684,Siltstone,Strat_Series,3,2,1e-08
39,1100,1000,1100,0.5658894736842105,0.5001,0.5527315789473684,Siltstone,Strat_Series,3,2,1e-08
40,1400,1000,1050,0.6448368421052632,0.5001,0.5395736842105263,Siltstone,Strat_Series,3,2,1e-08
41,1700,1000,1100,0.7237842105263158,0.5001,0.5527315789473684,Siltstone,Strat_Series,3,2,1e-08
42,1500,500,1000,0.6711526315789473,0.36852105263157897,0.5264157894736842,Siltstone,Strat_Series,3,2,1e-08
43,1500,1500,950,0.6711526315789473,0.631678947368421,0.5132578947368421,Siltstone,Strat_Series,3,2,1e-08
0,800,50,750,0.4869421052631579,0.2501,0.46062631578947366,Shale,Strat_Series,4,2,1e-08
1,800,150,700,0.4869421052631579,0.27641578947368417,0.44746842105263157,Shale,Strat_Series,4,2,1e-08
2,800,300,700,0.4869421052631579,0.3158894736842105,0.44746842105263157,Shale,Strat_Series,4,2,1e-08
3,800,500,800,0.4869421052631579,0.36852105263157897,0.4737842105263158,Shale,Strat_Series,4,2,1e-08
4,800,1000,1000,0.4869421052631579,0.5001,0.5264157894736842,Shale,Strat_Series,4,2,1e-08
5,800,1500,700,0.4869421052631579,0.631678947368421,0.44746842105263157,Shale,Strat_Series,4,2,1e-08
6,800,1700,600,0.4869421052631579,0.6843105263157895,0.42115263157894733,Shale,Strat_Series,4,2,1e-08
7,800,1950,650,0.4869421052631579,0.7501,0.4343105263157895,Shale,Strat_Series,4,2,1e-08
8,0,1000,1100,0.27641578947368417,0.5001,0.5527315789473684,Shale,Strat_Series,4,2,1e-08
9,300,1000,1000,0.3553631578947368,0.5001,0.5264157894736842,Shale,Strat_Series,4,2,1e-08
10,450,1000,950,0.39483684210526315,0.5001,0.5132578947368421,Shale,Strat_Series,4,2,1e-08
11,1100,1000,900,0.5658894736842105,0.5001,0.5001,Shale,Strat_Series,4,2,1e-08
12,1400,1000,850,0.6448368421052632,0.5001,0.4869421052631579,Shale,Strat_Series,4,2,1e-08
13,1700,1000,900,0.7237842105263158,0.5001,0.5001,Shale,Strat_Series,4,2,1e-08
14,1500,500,800,0.6711526315789473,0.36852105263157897,0.4737842105263158,Shale,Strat_Series,4,2,1e-08
15,1500,1500,750,0.6711526315789473,0.631678947368421,0.46062631578947366,Shale,Strat_Series,4,2,1e-08
16,800,50,450,0.4869421052631579,0.2501,0.38167894736842106,Sandstone_1,Strat_Series,5,2,1e-08
17,800,150,400,0.4869421052631579,0.27641578947368417,0.36852105263157897,Sandstone_1,Strat_Series,5,2,1e-08
18,800,300,400,0.4869421052631579,0.3158894736842105,0.36852105263157897,Sandstone_1,Strat_Series,5,2,1e-08
19,800,500,500,0.4869421052631579,0.36852105263157897,0.39483684210526315,Sandstone_1,Strat_Series,5,2,1e-08
20,800,1000,700,0.4869421052631579,0.5001,0.44746842105263157,Sandstone_1,Strat_Series,5,2,1e-08
21,800,1500,400,0.4869421052631579,0.631678947368421,0.36852105263157897,Sandstone_1,Strat_Series,5,2,1e-08
22,800,1700,300,0.4869421052631579,0.6843105263157895,0.34220526315789473,Sandstone_1,Strat_Series,5,2,1e-08
23,800,1950,350,0.4869421052631579,0.7501,0.3553631578947368,Sandstone_1,Strat_Series,5,2,1e-08
24,0,1000,800,0.27641578947368417,0.5001,0.4737842105263158,Sandstone_1,Strat_Series,5,2,1e-08
25,300,1000,700,0.3553631578947368,0.5001,0.44746842105263157,Sandstone_1,Strat_Series,5,2,1e-08
26,1100,1000,600,0.5658894736842105,0.5001,0.42115263157894733,Sandstone_1,Strat_Series,5,2,1e-08
27,1400,1000,550,0.6448368421052632,0.5001,0.40799473684210524,Sandstone_1,Strat_Series,5,2,1e-08
28,1700,1000,600,0.7237842105263158,0.5001,0.42115263157894733,Sandstone_1,Strat_Series,5,2,1e-08
29,1500,500,500,0.6711526315789473,0.36852105263157897,0.39483684210526315,Sandstone_1,Strat_Series,5,2,1e-08
30,1500,1500,450,0.6711526315789473,0.631678947368421,0.38167894736842106,Sandstone_1,Strat_Series,5,2,1e-08
60 changes: 30 additions & 30 deletions notebooks/data/gempy_models/Tutorial_ch1-1_Basics/Tutorial_ch1-1_Basics_surfaces.csv
View file
Expand Up @@ -12,33 +12,7 @@
[3297 3294 3298]
[3299 3295 3296]
[3298 3295 3299]]",1
1,Sandstone_1,Strat_Series,1,False,#9f0052,"[[ 11.65277243 40. 640. ]
[ 40. 0. 628.33095551]
[ 17.65794873 0. 640. ]
...
[1960. 1880. 512.40413666]
[1960. 1920. 507.28420258]
[1960. 1960. 502.68001556]]","[[ 2 1 0]
[ 0 1 3]
[ 0 5 4]
...
[4128 4061 4127]
[4128 4062 4061]
[4129 4062 4128]]",2
0,Shale,Strat_Series,2,False,#015482,"[[ 0. 0. 949.93858337]
[ 0. 40. 949.11346436]
[ 40. 0. 931.37771606]
...
[1960. 1880. 781.52412415]
[1960. 1920. 776.03843689]
[1960. 1960. 771.07582092]]","[[ 2 1 0]
[ 3 1 2]
[ 3 4 1]
...
[4047 3978 4046]
[4047 3980 3978]
[4048 3980 4047]]",3
3,Sandstone_2,Strat_Series,3,False,#728f02,"[[ 0. 0. 1399.34967041]
3,Sandstone_2,Strat_Series,1,False,#728f02,"[[ 0. 0. 1399.34967041]
[ 0. 40. 1399.55993652]
[ 40. 0. 1383.1892395 ]
...
Expand All @@ -50,8 +24,8 @@
...
[3763 3696 3762]
[3763 3697 3696]
[3764 3697 3763]]",4
2,Siltstone,Strat_Series,4,False,#ffbe00,"[[ 31.41110182 40. 1160. ]
[3764 3697 3763]]",2
2,Siltstone,Strat_Series,2,False,#ffbe00,"[[ 31.41110182 40. 1160. ]
[ 40. 0. 1156.60263062]
[ 32.15152502 0. 1160. ]
...
Expand All @@ -63,5 +37,31 @@
...
[3905 3836 3904]
[3905 3838 3836]
[3906 3838 3905]]",5
[3906 3838 3905]]",3
0,Shale,Strat_Series,3,False,#015482,"[[ 0. 0. 949.93858337]
[ 0. 40. 949.11346436]
[ 40. 0. 931.37771606]
...
[1960. 1880. 781.52412415]
[1960. 1920. 776.03843689]
[1960. 1960. 771.07582092]]","[[ 2 1 0]
[ 3 1 2]
[ 3 4 1]
...
[4047 3978 4046]
[4047 3980 3978]
[4048 3980 4047]]",4
1,Sandstone_1,Strat_Series,4,False,#9f0052,"[[ 11.65277243 40. 640. ]
[ 40. 0. 628.33095551]
[ 17.65794873 0. 640. ]
...
[1960. 1880. 512.40413666]
[1960. 1920. 507.28420258]
[1960. 1960. 502.68001556]]","[[ 2 1 0]
[ 0 1 3]
[ 0 5 4]
...
[4128 4061 4127]
[4128 4062 4061]
[4129 4062 4128]]",5
5,basement,Strat_Series,5,True,#ff3f20,,,6

0 comments on commit 6586332

Please sign in to comment.