Skip to content

Commit 78452fb

Browse files
committed
bug fix in test.py
1 parent 336d633 commit 78452fb

File tree

2 files changed

+2
-17
lines changed

2 files changed

+2
-17
lines changed

emotion_recognition.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@
55
from sklearn.metrics import accuracy_score, make_scorer, fbeta_score, mean_squared_error, mean_absolute_error
66
from sklearn.metrics import confusion_matrix
77
from sklearn.model_selection import GridSearchCV
8-
from sklearn.svm import SVC
9-
from sklearn.ensemble import AdaBoostClassifier, GradientBoostingClassifier, RandomForestClassifier
10-
from sklearn.naive_bayes import BernoulliNB, GaussianNB, ComplementNB
11-
from sklearn.tree import DecisionTreeClassifier
12-
from sklearn.neighbors import KNeighborsClassifier
13-
from sklearn.neural_network import MLPClassifier
148

159
import matplotlib.pyplot as pl
1610
from time import time

test.py

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import pyaudio
44
import os
55
import wave
6-
import numpy as np
76
from sys import byteorder
87
from array import array
98
from struct import pack
@@ -128,15 +127,6 @@ def get_estimators_name(estimators):
128127
return ','.join(result), {estimator_name.strip('"'): estimator for estimator_name, (estimator, _, _) in zip(result, estimators)}
129128

130129

131-
audio_config = {
132-
"mfcc": True,
133-
"chroma": True,
134-
"mel": True,
135-
"contrast": False,
136-
"tonnetz": False,
137-
}
138-
139-
140130

141131
if __name__ == "__main__":
142132
estimators = get_best_estimators(True)
@@ -161,7 +151,8 @@ def get_estimators_name(estimators):
161151
# Parse the arguments passed
162152
args = parser.parse_args()
163153

164-
detector = EmotionRecognizer(estimator_dict[args.model], emotions=args.emotions.split(","), audio_config=audio_config, verbose=0)
154+
features = ["mfcc", "chroma", "mel"]
155+
detector = EmotionRecognizer(estimator_dict[args.model], emotions=args.emotions.split(","), features=features, verbose=0)
165156
detector.train()
166157
print("Test accuracy score: {:.3f}%".format(detector.test_score()*100))
167158
print("Please talk")

0 commit comments

Comments
 (0)