60bb6399886610d1ff444b40dd43a7e9e3a5bf0d,framework/PostProcessors/Metric.py,Metric,run,#Metric#Any#,271

Before Change

        nodeName = str(self.features[cnt]) + "-" + str(self.targets[cnt])
        outputDict[nodeName] = {}
        for metricInstance in self.metricsDict.values():
          output = metricInstance.distance(inputDict["features"][self.features[cnt]], inputDict["targets"][self.targets[cnt]])
          if hasattr(metricInstance, "metricType"):
            metricName = metricInstance.metricType
          else:
            metricName = metricInstance.type

After Change

        nodeName = str(self.features[cnt]) + "-" + str(self.targets[cnt])
        outputDict[nodeName] = {}
        for metricInstance in self.metricsDict.values():
          inData = []
          for inputKey, subKey in [("features",self.features[cnt]),
                                     ("targets",self.targets[cnt])]:
            if metricInstance.acceptsProbability and subKey in inputDict[inputKey+"_prob"]:
              inData.append((inputDict[inputKey][subKey],
                             inputDict[inputKey+"_prob"][subKey]))
            else:
              inData.append(inputDict[inputKey][subKey])
          output = metricInstance.distance(inData[0], inData[1])
          if hasattr(metricInstance, "metricType"):
            metricName = metricInstance.metricType
          else:
            metricName = metricInstance.type

Instances