Skip to content

Commit 560e724

Browse files
committed
RFCT Simpler code. Match other scripts
1 parent 5d7a21f commit 560e724

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

ch02/heldout.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
# This script demonstrates the difference between the training accuracy and
99
# testing (held-out) accuracy.
1010

11-
from matplotlib import pyplot as plt
1211
import numpy as np
1312
from sklearn.datasets import load_iris
1413
from threshold import fit_model, accuracy
@@ -18,20 +17,20 @@
1817
labels = data['target_names'][data['target']]
1918

2019
# We are going to remove the setosa examples as they are too easy:
21-
setosa = (labels == 'setosa')
22-
features = features[~setosa]
23-
labels = labels[~setosa]
20+
is_setosa = (labels == 'setosa')
21+
features = features[~is_setosa]
22+
labels = labels[~is_setosa]
2423

2524
# Now we classify virginica vs non-virginica
26-
virginica = (labels == 'virginica')
25+
is_virginica = (labels == 'virginica')
2726

2827
# Split the data in two: testing and training
2928
testing = np.tile([True, False], 50) # testing = [True,False,True,False,True,False...]
3029
training = ~testing
3130

32-
model = fit_model(features[training], virginica[training])
33-
train_accuracy = accuracy(features[training], virginica[training], model)
34-
test_accuracy = accuracy(features[testing], virginica[testing], model)
31+
model = fit_model(features[training], is_virginica[training])
32+
train_accuracy = accuracy(features[training], is_virginica[training], model)
33+
test_accuracy = accuracy(features[testing], is_virginica[testing], model)
3534

3635
print('''\
3736
Training accuracy was {0:.1%}.

0 commit comments

Comments
 (0)