Skip to content

Commit a82d39e

Browse files
committed
Use pandas .iloc instead of deprecated .ix
1 parent 40d27fa commit a82d39e

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

beginner_source/data_loading_tutorial.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@
6666
landmarks_frame = pd.read_csv('faces/face_landmarks.csv')
6767

6868
n = 65
69-
img_name = landmarks_frame.ix[n, 0]
70-
landmarks = landmarks_frame.ix[n, 1:].as_matrix().astype('float')
71-
landmarks = landmarks.reshape(-1, 2)
69+
img_name = landmarks_frame.iloc[n, 0]
70+
landmarks = landmarks_frame.iloc[n, 1:].as_matrix()
71+
landmarks = landmarks.astype('float').reshape(-1, 2)
7272

7373
print('Image name: {}'.format(img_name))
7474
print('Landmarks shape: {}'.format(landmarks.shape))
@@ -136,10 +136,11 @@ def __len__(self):
136136
return len(self.landmarks_frame)
137137

138138
def __getitem__(self, idx):
139-
img_name = os.path.join(self.root_dir, self.landmarks_frame.ix[idx, 0])
139+
img_name = os.path.join(self.root_dir,
140+
self.landmarks_frame.iloc[idx, 0])
140141
image = io.imread(img_name)
141-
landmarks = self.landmarks_frame.ix[idx, 1:].as_matrix().astype('float')
142-
landmarks = landmarks.reshape(-1, 2)
142+
landmarks = self.landmarks_frame.iloc[idx, 1:].as_matrix()
143+
landmarks = landmarks.astype('float').reshape(-1, 2)
143144
sample = {'image': image, 'landmarks': landmarks}
144145

145146
if self.transform:

0 commit comments

Comments
 (0)