X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FdaComposant%2FdaDiagnostics%2FVarianceOrder.py;h=49cbf5bdeb2389e7147baedfe25c457f9ddc91a1;hb=a1b65e4f23cb823829f0ba5d9ca3696f3c44b801;hp=202838ee1a40766d3a1209bda2ec6516cbbbef06;hpb=5fa5aa52fa87c7b1dfd81c77648065b7b0bb2dc6;p=modules%2Fadao.git diff --git a/src/daComposant/daDiagnostics/VarianceOrder.py b/src/daComposant/daDiagnostics/VarianceOrder.py index 202838e..49cbf5b 100644 --- a/src/daComposant/daDiagnostics/VarianceOrder.py +++ b/src/daComposant/daDiagnostics/VarianceOrder.py @@ -1,6 +1,6 @@ #-*-coding:iso-8859-1-*- # -# Copyright (C) 2008-2009 EDF R&D +# Copyright (C) 2008-2010 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -29,18 +29,15 @@ __doc__ = """ """ __author__ = "Sophie RICCI, Jean-Philippe ARGAUD - Septembre 2008" -import sys ; sys.path.insert(0, "../daCore") - import numpy -import Persistence -from BasicObjects import Diagnostic from scipy.linalg import eig +from daCore import BasicObjects, Persistence import logging # ============================================================================== -class ElementaryDiagnostic(Diagnostic,Persistence.OneScalar): +class ElementaryDiagnostic(BasicObjects.Diagnostic,Persistence.OneScalar): def __init__(self, name = "", unit = "", basetype = None, parameters = {}): - Diagnostic.__init__(self, name, parameters) + BasicObjects.Diagnostic.__init__(self, name, parameters) Persistence.OneScalar.__init__( self, name, unit, basetype = bool ) def _formula(self, xb, B, yo, R):