4ceb227fd58b3247dd892b527f0cf3bb014c3c84,fermodel.py,FERModel,_choose_model_from_target_emotions,#FERModel#,95

Before Change

        
        print("Creating FER model...")
        self._extract_features()    // TODO: call _extract_features for appropriate models
        return ConvolutionalLstmNN(self.target_dimensions, self.channels, emotion_map=self.emotion_map, time_delay=self.time_delay, verbose=self.verbose)
        // TODO: add conditionals to choose best models for all emotion subsets

    def _extract_features(self):
        

After Change

        
        print("Initializing FER model...")

        model_indices = [self.emotion_index_map[emotion] for emotion in self.target_emotions]
        sorted_indices = [str(idx) for idx in sorted(model_indices)]
        model_suffix = "".join(sorted_indices)

        model_file = open("../models/conv_model_%s.json" % model_suffix,"r")
        weights_file = "../models/conv_weights_%s.h5" % model_suffix

Instances