From b59a6cf49785e068d072c3f5e8c354fe6983a78c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9?= Date: Thu, 22 Apr 2010 10:28:55 +0200 Subject: [PATCH] Debut de l'utilisation de daStudy dans les schemas --- resources/DATASSIMSchemaCatalog.xml | 2 ++ src/daComposant/daAlgorithms/Blue.py | 8 ++++---- src/daComposant/daCore/__init__.py | 0 src/daSalome/daYacsIntegration/{adStudy.py => daStudy.py} | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 src/daComposant/daCore/__init__.py rename src/daSalome/daYacsIntegration/{adStudy.py => daStudy.py} (76%) diff --git a/resources/DATASSIMSchemaCatalog.xml b/resources/DATASSIMSchemaCatalog.xml index 8984357..eee86ad 100644 --- a/resources/DATASSIMSchemaCatalog.xml +++ b/resources/DATASSIMSchemaCatalog.xml @@ -62,6 +62,8 @@ else: print "ObservationOperator is", ObservationOperator print "ObservationOperatorType is", ObservationOperatorType +from daYacsIntegration.daStudy import * +assim_study = daStudy(Name, Algorithm) ]]> diff --git a/src/daComposant/daAlgorithms/Blue.py b/src/daComposant/daAlgorithms/Blue.py index 3e5704d..5dad7c3 100644 --- a/src/daComposant/daAlgorithms/Blue.py +++ b/src/daComposant/daAlgorithms/Blue.py @@ -23,11 +23,11 @@ __doc__ = """ """ __author__ = "Jean-Philippe ARGAUD - Mars 2008" -import sys ; sys.path.insert(0, "../daCore") +import sys import logging -import Persistence -from BasicObjects import Algorithm -import PlatformInfo ; m = PlatformInfo.SystemUsage() +from daCore import Persistence +from daCore.BasicObjects import Algorithm +from daCore import PlatformInfo ; m = PlatformInfo.SystemUsage() # ============================================================================== class ElementaryAlgorithm(Algorithm): diff --git a/src/daComposant/daCore/__init__.py b/src/daComposant/daCore/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/daSalome/daYacsIntegration/adStudy.py b/src/daSalome/daYacsIntegration/daStudy.py similarity index 76% rename from src/daSalome/daYacsIntegration/adStudy.py rename to src/daSalome/daYacsIntegration/daStudy.py index be70026..6b8beb1 100644 --- a/src/daSalome/daYacsIntegration/adStudy.py +++ b/src/daSalome/daYacsIntegration/daStudy.py @@ -1,8 +1,8 @@ #-*-coding:iso-8859-1-*- -from AssimilationStudy import AssimilationStudy +from daCore.AssimilationStudy import AssimilationStudy -class adStudy: +class daStudy: def __init__(self, name, algorithm): -- 2.39.2