diff --git a/automog/code/modeling/automog.py b/automog/code/modeling/automog.py index e3d80839d220e93b749c1fe09ec7ac3ec54bbe11..15596f13cd9ccec7b6ac6fad17e41b9eefe59e02 100644 --- a/automog/code/modeling/automog.py +++ b/automog/code/modeling/automog.py @@ -320,7 +320,7 @@ class AutoMoG(object): for state in comp.operating_points: curves = self.curves[comp.name][state] sect = self.sections[comp.name][state] - total_model_error += curves[sect]['mse']*comp.weighting_factors[comp.inputs[0]] + total_model_error += np.sqrt(curves[sect]['mse'])*comp.weighting_factors[comp.inputs[0]] return total_model_error @@ -399,7 +399,7 @@ class AutoMoG(object): elif self.options['mode'] == 'WEIGHTED ERROR': weight_error_model = sum(sum(comp.weighting_factors[comp.inputs[0]]*\ - np.sqrt(self.curves[comp.name][state][self.sections[comp.name][state]]['model_error']) + np.sqrt(self.curves[comp.name][state][self.sections[comp.name][state]]['mse']) for state in comp.operating_points) for comp in self.components.values()) @@ -658,4 +658,4 @@ class MOG_Component(object): if not attr == 'sections': setattr(self, attr, kwargs[attr]) else: - self.sections = kwargs[attr] \ No newline at end of file + self.sections = kwargs[attr]