[Sandbox-commits] r521 - in masc/masc-api/src: main/java/fr/inra/masc/io main/java/fr/inra/masc/io/parser main/java/fr/inra/masc/io/writer main/java/fr/inra/masc/services main/xmi test/java/fr/inra/masc/services

Author: sletellier Date: 2011-12-15 11:50:26 +0100 (Thu, 15 Dec 2011) New Revision: 521 Url: http://nuiton.org/repositories/revision/sandbox/521 Log: Rename mexico experienceDesign to experimentDesign Added: masc/masc-api/src/main/java/fr/inra/masc/io/parser/ExperimentDesignParser.java masc/masc-api/src/main/java/fr/inra/masc/io/writer/ExperimentDesignXmlWriter.java Removed: masc/masc-api/src/main/java/fr/inra/masc/io/parser/ExperienceDesignParser.java masc/masc-api/src/main/java/fr/inra/masc/io/writer/ExperienceDesignXmlWriter.java Modified: masc/masc-api/src/main/java/fr/inra/masc/io/MexicoXmlConstant.java masc/masc-api/src/main/java/fr/inra/masc/io/parser/InputDesignParser.java masc/masc-api/src/main/java/fr/inra/masc/services/MexicoLoadModelService.java masc/masc-api/src/main/java/fr/inra/masc/services/MexicoModelConvertorService.java masc/masc-api/src/main/java/fr/inra/masc/services/MexicoSaveModelService.java masc/masc-api/src/main/xmi/mexico.zargo masc/masc-api/src/test/java/fr/inra/masc/services/MexicoLoadModelServiceTest.java masc/masc-api/src/test/java/fr/inra/masc/services/MexicoModelConvertorServiceTest.java masc/masc-api/src/test/java/fr/inra/masc/services/MexicoSaveModelServiceTest.java Modified: masc/masc-api/src/main/java/fr/inra/masc/io/MexicoXmlConstant.java =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/io/MexicoXmlConstant.java 2011-12-15 10:31:40 UTC (rev 520) +++ masc/masc-api/src/main/java/fr/inra/masc/io/MexicoXmlConstant.java 2011-12-15 10:50:26 UTC (rev 521) @@ -1,7 +1,7 @@ package fr.inra.masc.io; import fr.ifremer.mexico.model.Domain; -import fr.ifremer.mexico.model.ExperienceDesign; +import fr.ifremer.mexico.model.ExperimentDesign; import fr.ifremer.mexico.model.Factor; import fr.ifremer.mexico.model.Feature; import fr.ifremer.mexico.model.InputDesign; @@ -15,13 +15,13 @@ */ public class MexicoXmlConstant { - public static final String EXPERIMENT_DESIGN = ExperienceDesign.class.getSimpleName().toLowerCase(); - public static final String EXPERIMENT_DESIGN_DATE = ExperienceDesign.PROPERTY_DATE; - public static final String EXPERIMENT_DESIGN_ID = ExperienceDesign.PROPERTY_ID; - public static final String EXPERIMENT_DESIGN_AUTHOR = ExperienceDesign.PROPERTY_AUTHOR; - public static final String EXPERIMENT_DESIGN_LICENCE = ExperienceDesign.PROPERTY_LICENCE; - public static final String EXPERIMENT_DESIGN_DESCRIPTION = ExperienceDesign.PROPERTY_DESCRIPTION; - public static final String FACTORS = ExperienceDesign.PROPERTY_FACTORS; + public static final String EXPERIMENT_DESIGN = ExperimentDesign.class.getSimpleName().toLowerCase(); + public static final String EXPERIMENT_DESIGN_DATE = ExperimentDesign.PROPERTY_DATE; + public static final String EXPERIMENT_DESIGN_ID = ExperimentDesign.PROPERTY_ID; + public static final String EXPERIMENT_DESIGN_AUTHOR = ExperimentDesign.PROPERTY_AUTHOR; + public static final String EXPERIMENT_DESIGN_LICENCE = ExperimentDesign.PROPERTY_LICENCE; + public static final String EXPERIMENT_DESIGN_DESCRIPTION = ExperimentDesign.PROPERTY_DESCRIPTION; + public static final String FACTORS = ExperimentDesign.PROPERTY_FACTORS; public static final String FACTOR = Factor.class.getSimpleName().toLowerCase(); public static final String FACTOR_ID = Factor.PROPERTY_ID; public static final String FACTOR_NAME = Factor.PROPERTY_NAME; Deleted: masc/masc-api/src/main/java/fr/inra/masc/io/parser/ExperienceDesignParser.java =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/io/parser/ExperienceDesignParser.java 2011-12-15 10:31:40 UTC (rev 520) +++ masc/masc-api/src/main/java/fr/inra/masc/io/parser/ExperienceDesignParser.java 2011-12-15 10:50:26 UTC (rev 521) @@ -1,215 +0,0 @@ -package fr.inra.masc.io.parser; - -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import fr.ifremer.mexico.model.Domain; -import fr.ifremer.mexico.model.DomainImpl; -import fr.ifremer.mexico.model.ExperienceDesign; -import fr.ifremer.mexico.model.ExperienceDesignImpl; -import fr.ifremer.mexico.model.Factor; -import fr.ifremer.mexico.model.FactorImpl; -import fr.ifremer.mexico.model.Feature; -import fr.ifremer.mexico.model.FeatureImpl; -import fr.ifremer.mexico.model.ValueType; -import fr.inra.masc.MascTechnicalException; -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; - -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.text.ParseException; -import java.util.List; -import java.util.Map; - -import static fr.inra.masc.io.MexicoXmlConstant.DOMAIN; -import static fr.inra.masc.io.MexicoXmlConstant.DOMAIN_DISTRIBUTION_PARAMETER; -import static fr.inra.masc.io.MexicoXmlConstant.DOMAIN_LEVEL; -import static fr.inra.masc.io.MexicoXmlConstant.DOMAIN_NAME; -import static fr.inra.masc.io.MexicoXmlConstant.DOMAIN_NOMINAL_VALUE; -import static fr.inra.masc.io.MexicoXmlConstant.DOMAIN_VALUE_TYPE; -import static fr.inra.masc.io.MexicoXmlConstant.EXPERIMENT_DESIGN; -import static fr.inra.masc.io.MexicoXmlConstant.EXPERIMENT_DESIGN_AUTHOR; -import static fr.inra.masc.io.MexicoXmlConstant.EXPERIMENT_DESIGN_DATE; -import static fr.inra.masc.io.MexicoXmlConstant.EXPERIMENT_DESIGN_DESCRIPTION; -import static fr.inra.masc.io.MexicoXmlConstant.EXPERIMENT_DESIGN_ID; -import static fr.inra.masc.io.MexicoXmlConstant.EXPERIMENT_DESIGN_LICENCE; -import static fr.inra.masc.io.MexicoXmlConstant.FACTORS; -import static fr.inra.masc.io.MexicoXmlConstant.FACTOR_DESCRIPTION; -import static fr.inra.masc.io.MexicoXmlConstant.FEATURE; -import static fr.inra.masc.io.MexicoXmlConstant.FEATURE_NAME; -import static fr.inra.masc.io.MexicoXmlConstant.FEATURE_VALUE; -import static fr.inra.masc.io.MexicoXmlConstant.FEATURE_VALUE_TYPE; - -/** -* @author sletellier <letellier@codelutin.com> -*/ -public class ExperienceDesignParser extends MexicoXmlParser<ExperienceDesign> { - - protected Map<String, Factor> factors; - - public ExperienceDesignParser(File file) throws FileNotFoundException { - super(file); - this.factors = Maps.newHashMap(); - } - - @Override - protected ExperienceDesign parseModel(XmlPullParser parser) throws IOException, XmlPullParserException, ParseException { - ExperienceDesign model = new ExperienceDesignImpl(); - - parseExperienceDesignMeta(parser, model); - parseFactors(parser, model); - - return model; - } - - protected void parseExperienceDesignMeta(XmlPullParser parser, ExperienceDesign model) throws IOException, XmlPullParserException, ParseException { - - // file must start with experiment design tag - if (parser.nextTag() == XmlPullParser.START_TAG && - !parserEqual(parser, EXPERIMENT_DESIGN)) { - throw new MascTechnicalException("Experiment design file must start with " + EXPERIMENT_DESIGN + " tag"); - } - - // parse experiment design id - String id = parser.getAttributeValue(null, EXPERIMENT_DESIGN_ID); - model.setId(id); - - // parse date - String dateAsString = parser.getAttributeValue(null, EXPERIMENT_DESIGN_DATE); - model.setDate(parseDate(dateAsString)); - - // parse author - String author = parser.getAttributeValue(null, EXPERIMENT_DESIGN_AUTHOR); - model.setAuthor(author); - - // parse license - String license = parser.getAttributeValue(null, EXPERIMENT_DESIGN_LICENCE); - model.setLicence(license); - - // parse description - if (parser.nextTag() == XmlPullParser.START_TAG && - parserEqual(parser, EXPERIMENT_DESIGN_DESCRIPTION)) { - - model.setDescription(parser.nextText()); - - // read next tag - parser.nextTag(); - } - } - protected void parseFactors(XmlPullParser parser, ExperienceDesign model) throws IOException, XmlPullParserException { - - // factors - int eventType = parser.getEventType(); - if (eventType == XmlPullParser.START_TAG && - parserEqual(parser, FACTORS)) { - - List<Factor> factors = Lists.newArrayList(); - while (!(parser.nextTag() == XmlPullParser.END_TAG && - parserEqual(parser, FACTORS))) { - - // factor - factors.add(parseFactor(parser)); - } - model.setFactors(factors); - } - - // read experience design next tag - parser.nextTag(); - } - - protected Factor parseFactor(XmlPullParser parser) throws IOException, XmlPullParserException { - - Factor factor = new FactorImpl(); - - // parse description - int eventType = parser.nextTag(); - if (eventType == XmlPullParser.START_TAG && - parserEqual(parser, FACTOR_DESCRIPTION)) { - factor.setDescription(parser.nextText()); - - // read function close tag - eventType = parser.nextTag(); - } - - // domain - if (eventType == XmlPullParser.START_TAG && - parserEqual(parser, DOMAIN)) { - factor.setDomain(parseDomain(parser)); - } - - // features - if (parser.getEventType() == XmlPullParser.START_TAG && - parserEqual(parser, FEATURE)) { - - List<Feature> features = Lists.newArrayList(); - - while (parserEqual(parser, FEATURE)) { - - // feature - features.add(parseFeature(parser)); - - // read feature close tag - parser.nextTag(); - - // read next tag - parser.nextTag(); - } - factor.setFeatures(features); - } - - // keep factors - factors.put(factor.getId(), factor); - - return factor; - } - protected Domain parseDomain(XmlPullParser parser) throws XmlPullParserException { - Domain domain = new DomainImpl(); - - // name - String name = parser.getAttributeValue(null, DOMAIN_NAME); - domain.setName(name); - - // distributionParameter - String distributionParameter = parser.getAttributeValue(null, DOMAIN_DISTRIBUTION_PARAMETER); - domain.setDistributionParameter(distributionParameter); - - // level - String level = parser.getAttributeValue(null, DOMAIN_LEVEL); - domain.setLevel(Integer.parseInt(level)); - - // valueType - String valueType = parser.getAttributeValue(null, DOMAIN_VALUE_TYPE); - domain.setValueType(ValueType.valueOf(valueType)); - - // nominaleValue - // TODO sletellier 20111215 : take care of type - String nominaleValue = parser.getAttributeValue(null, DOMAIN_NOMINAL_VALUE); - domain.setNominalValue(nominaleValue); - - return domain; - } - - protected Feature parseFeature(XmlPullParser parser) { - Feature feature = new FeatureImpl(); - - // name - String name = parser.getAttributeValue(null, FEATURE_NAME); - feature.setName(name); - - // value - // TODO sletellier 20111215 : take care of type - String value = parser.getAttributeValue(null, FEATURE_VALUE); - feature.setValue(value); - - // value type - String valueType = parser.getAttributeValue(null, FEATURE_VALUE_TYPE); - feature.setValueType(ValueType.valueOf(valueType)); - - return feature; - } - - public Map<String, Factor> getFactors() { - return factors; - } -} Copied: masc/masc-api/src/main/java/fr/inra/masc/io/parser/ExperimentDesignParser.java (from rev 520, masc/masc-api/src/main/java/fr/inra/masc/io/parser/ExperienceDesignParser.java) =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/io/parser/ExperimentDesignParser.java (rev 0) +++ masc/masc-api/src/main/java/fr/inra/masc/io/parser/ExperimentDesignParser.java 2011-12-15 10:50:26 UTC (rev 521) @@ -0,0 +1,215 @@ +package fr.inra.masc.io.parser; + +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import fr.ifremer.mexico.model.Domain; +import fr.ifremer.mexico.model.DomainImpl; +import fr.ifremer.mexico.model.ExperimentDesign; +import fr.ifremer.mexico.model.ExperimentDesignImpl; +import fr.ifremer.mexico.model.Factor; +import fr.ifremer.mexico.model.FactorImpl; +import fr.ifremer.mexico.model.Feature; +import fr.ifremer.mexico.model.FeatureImpl; +import fr.ifremer.mexico.model.ValueType; +import fr.inra.masc.MascTechnicalException; +import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserException; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.text.ParseException; +import java.util.List; +import java.util.Map; + +import static fr.inra.masc.io.MexicoXmlConstant.DOMAIN; +import static fr.inra.masc.io.MexicoXmlConstant.DOMAIN_DISTRIBUTION_PARAMETER; +import static fr.inra.masc.io.MexicoXmlConstant.DOMAIN_LEVEL; +import static fr.inra.masc.io.MexicoXmlConstant.DOMAIN_NAME; +import static fr.inra.masc.io.MexicoXmlConstant.DOMAIN_NOMINAL_VALUE; +import static fr.inra.masc.io.MexicoXmlConstant.DOMAIN_VALUE_TYPE; +import static fr.inra.masc.io.MexicoXmlConstant.EXPERIMENT_DESIGN; +import static fr.inra.masc.io.MexicoXmlConstant.EXPERIMENT_DESIGN_AUTHOR; +import static fr.inra.masc.io.MexicoXmlConstant.EXPERIMENT_DESIGN_DATE; +import static fr.inra.masc.io.MexicoXmlConstant.EXPERIMENT_DESIGN_DESCRIPTION; +import static fr.inra.masc.io.MexicoXmlConstant.EXPERIMENT_DESIGN_ID; +import static fr.inra.masc.io.MexicoXmlConstant.EXPERIMENT_DESIGN_LICENCE; +import static fr.inra.masc.io.MexicoXmlConstant.FACTORS; +import static fr.inra.masc.io.MexicoXmlConstant.FACTOR_DESCRIPTION; +import static fr.inra.masc.io.MexicoXmlConstant.FEATURE; +import static fr.inra.masc.io.MexicoXmlConstant.FEATURE_NAME; +import static fr.inra.masc.io.MexicoXmlConstant.FEATURE_VALUE; +import static fr.inra.masc.io.MexicoXmlConstant.FEATURE_VALUE_TYPE; + +/** +* @author sletellier <letellier@codelutin.com> +*/ +public class ExperimentDesignParser extends MexicoXmlParser<ExperimentDesign> { + + protected Map<String, Factor> factors; + + public ExperimentDesignParser(File file) throws FileNotFoundException { + super(file); + this.factors = Maps.newHashMap(); + } + + @Override + protected ExperimentDesign parseModel(XmlPullParser parser) throws IOException, XmlPullParserException, ParseException { + ExperimentDesign model = new ExperimentDesignImpl(); + + parseExperimentDesignMeta(parser, model); + parseFactors(parser, model); + + return model; + } + + protected void parseExperimentDesignMeta(XmlPullParser parser, ExperimentDesign model) throws IOException, XmlPullParserException, ParseException { + + // file must start with experiment design tag + if (parser.nextTag() == XmlPullParser.START_TAG && + !parserEqual(parser, EXPERIMENT_DESIGN)) { + throw new MascTechnicalException("Experiment design file must start with " + EXPERIMENT_DESIGN + " tag"); + } + + // parse experiment design id + String id = parser.getAttributeValue(null, EXPERIMENT_DESIGN_ID); + model.setId(id); + + // parse date + String dateAsString = parser.getAttributeValue(null, EXPERIMENT_DESIGN_DATE); + model.setDate(parseDate(dateAsString)); + + // parse author + String author = parser.getAttributeValue(null, EXPERIMENT_DESIGN_AUTHOR); + model.setAuthor(author); + + // parse license + String license = parser.getAttributeValue(null, EXPERIMENT_DESIGN_LICENCE); + model.setLicence(license); + + // parse description + if (parser.nextTag() == XmlPullParser.START_TAG && + parserEqual(parser, EXPERIMENT_DESIGN_DESCRIPTION)) { + + model.setDescription(parser.nextText()); + + // read next tag + parser.nextTag(); + } + } + protected void parseFactors(XmlPullParser parser, ExperimentDesign model) throws IOException, XmlPullParserException { + + // factors + int eventType = parser.getEventType(); + if (eventType == XmlPullParser.START_TAG && + parserEqual(parser, FACTORS)) { + + List<Factor> factors = Lists.newArrayList(); + while (!(parser.nextTag() == XmlPullParser.END_TAG && + parserEqual(parser, FACTORS))) { + + // factor + factors.add(parseFactor(parser)); + } + model.setFactors(factors); + } + + // read experience design next tag + parser.nextTag(); + } + + protected Factor parseFactor(XmlPullParser parser) throws IOException, XmlPullParserException { + + Factor factor = new FactorImpl(); + + // parse description + int eventType = parser.nextTag(); + if (eventType == XmlPullParser.START_TAG && + parserEqual(parser, FACTOR_DESCRIPTION)) { + factor.setDescription(parser.nextText()); + + // read function close tag + eventType = parser.nextTag(); + } + + // domain + if (eventType == XmlPullParser.START_TAG && + parserEqual(parser, DOMAIN)) { + factor.setDomain(parseDomain(parser)); + } + + // features + if (parser.getEventType() == XmlPullParser.START_TAG && + parserEqual(parser, FEATURE)) { + + List<Feature> features = Lists.newArrayList(); + + while (parserEqual(parser, FEATURE)) { + + // feature + features.add(parseFeature(parser)); + + // read feature close tag + parser.nextTag(); + + // read next tag + parser.nextTag(); + } + factor.setFeatures(features); + } + + // keep factors + factors.put(factor.getId(), factor); + + return factor; + } + protected Domain parseDomain(XmlPullParser parser) throws XmlPullParserException { + Domain domain = new DomainImpl(); + + // name + String name = parser.getAttributeValue(null, DOMAIN_NAME); + domain.setName(name); + + // distributionParameter + String distributionParameter = parser.getAttributeValue(null, DOMAIN_DISTRIBUTION_PARAMETER); + domain.setDistributionParameter(distributionParameter); + + // level + String level = parser.getAttributeValue(null, DOMAIN_LEVEL); + domain.setLevel(Integer.parseInt(level)); + + // valueType + String valueType = parser.getAttributeValue(null, DOMAIN_VALUE_TYPE); + domain.setValueType(ValueType.valueOf(valueType)); + + // nominaleValue + // TODO sletellier 20111215 : take care of type + String nominaleValue = parser.getAttributeValue(null, DOMAIN_NOMINAL_VALUE); + domain.setNominalValue(nominaleValue); + + return domain; + } + + protected Feature parseFeature(XmlPullParser parser) { + Feature feature = new FeatureImpl(); + + // name + String name = parser.getAttributeValue(null, FEATURE_NAME); + feature.setName(name); + + // value + // TODO sletellier 20111215 : take care of type + String value = parser.getAttributeValue(null, FEATURE_VALUE); + feature.setValue(value); + + // value type + String valueType = parser.getAttributeValue(null, FEATURE_VALUE_TYPE); + feature.setValueType(ValueType.valueOf(valueType)); + + return feature; + } + + public Map<String, Factor> getFactors() { + return factors; + } +} Modified: masc/masc-api/src/main/java/fr/inra/masc/io/parser/InputDesignParser.java =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/io/parser/InputDesignParser.java 2011-12-15 10:31:40 UTC (rev 520) +++ masc/masc-api/src/main/java/fr/inra/masc/io/parser/InputDesignParser.java 2011-12-15 10:50:26 UTC (rev 521) @@ -2,7 +2,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.mexico.model.ExperienceDesign; +import fr.ifremer.mexico.model.ExperimentDesign; import fr.ifremer.mexico.model.Factor; import fr.ifremer.mexico.model.InputDesign; import fr.ifremer.mexico.model.InputDesignImpl; @@ -32,11 +32,11 @@ */ public class InputDesignParser extends MexicoXmlParser<InputDesign> { - protected ExperienceDesignParser experienceDesignParser; + protected ExperimentDesignParser experimentDesignParser; public InputDesignParser(File file) throws FileNotFoundException { super(file); - experienceDesignParser = new ExperienceDesignParser(file); + experimentDesignParser = new ExperimentDesignParser(file); } @Override @@ -46,8 +46,8 @@ parseInputDesignMeta(parser, model); // parse experiment design - ExperienceDesign experienceDesign = experienceDesignParser.parseModel(parser); - model.setExperienceDesign(experienceDesign); + ExperimentDesign experimentDesign = experimentDesignParser.parseModel(parser); + model.setExperimentDesign(experimentDesign); parseScenarios(parser, model); @@ -105,7 +105,7 @@ // get factor String factorId = parser.getAttributeValue(null, FACTOR); - Factor factor = experienceDesignParser.getFactors().get(factorId); + Factor factor = experimentDesignParser.getFactors().get(factorId); // factor value String value = parser.nextText(); Deleted: masc/masc-api/src/main/java/fr/inra/masc/io/writer/ExperienceDesignXmlWriter.java =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/io/writer/ExperienceDesignXmlWriter.java 2011-12-15 10:31:40 UTC (rev 520) +++ masc/masc-api/src/main/java/fr/inra/masc/io/writer/ExperienceDesignXmlWriter.java 2011-12-15 10:50:26 UTC (rev 521) @@ -1,113 +0,0 @@ -package fr.inra.masc.io.writer; - -import fr.ifremer.mexico.model.Domain; -import fr.ifremer.mexico.model.ExperienceDesign; -import fr.ifremer.mexico.model.Factor; -import org.apache.commons.lang3.StringUtils; - -import java.io.File; -import java.io.IOException; -import java.util.Collection; -import java.util.Date; - -import static fr.inra.masc.io.MexicoXmlConstant.DOMAIN; -import static fr.inra.masc.io.MexicoXmlConstant.DOMAIN_DISTRIBUTION_PARAMETER; -import static fr.inra.masc.io.MexicoXmlConstant.DOMAIN_LEVEL; -import static fr.inra.masc.io.MexicoXmlConstant.DOMAIN_NAME; -import static fr.inra.masc.io.MexicoXmlConstant.DOMAIN_NOMINAL_VALUE; -import static fr.inra.masc.io.MexicoXmlConstant.DOMAIN_VALUE_TYPE; -import static fr.inra.masc.io.MexicoXmlConstant.EXPERIMENT_DESIGN; -import static fr.inra.masc.io.MexicoXmlConstant.EXPERIMENT_DESIGN_AUTHOR; -import static fr.inra.masc.io.MexicoXmlConstant.EXPERIMENT_DESIGN_DATE; -import static fr.inra.masc.io.MexicoXmlConstant.EXPERIMENT_DESIGN_DESCRIPTION; -import static fr.inra.masc.io.MexicoXmlConstant.EXPERIMENT_DESIGN_ID; -import static fr.inra.masc.io.MexicoXmlConstant.EXPERIMENT_DESIGN_LICENCE; -import static fr.inra.masc.io.MexicoXmlConstant.FACTOR; -import static fr.inra.masc.io.MexicoXmlConstant.FACTORS; -import static fr.inra.masc.io.MexicoXmlConstant.FACTOR_DESCRIPTION; -import static fr.inra.masc.io.MexicoXmlConstant.FACTOR_ID; -import static fr.inra.masc.io.MexicoXmlConstant.FACTOR_NAME; -import static fr.inra.masc.io.MexicoXmlConstant.FACTOR_UNIT; - -/** - * Writer to create experiment design file with {@link ExperienceDesign} model - * - * @author sletellier <letellier@codelutin.com> - * @since 0.1 - */ -public class ExperienceDesignXmlWriter extends MexicoXmlWriter<ExperienceDesign> { - - public ExperienceDesignXmlWriter(File file, ExperienceDesign model) throws IOException { - super(file, model); - } - - @Override - public XmlNode getRootElement() { - - XmlNode rootXmlNode = new XmlNode(EXPERIMENT_DESIGN); - composeExperienceDesignMeta(rootXmlNode); - composeFactors(rootXmlNode); - - // TODO sletellier 2011/12/14 : implement workflow - // composeWorkFlow(rootXmlNode); - - return rootXmlNode; - } - - protected void composeExperienceDesignMeta(XmlNode rootXmlNode) { - - // date - Date date = model.getDate(); - addParameter(rootXmlNode, EXPERIMENT_DESIGN_DATE, formatDate(date)); - - addParameter(rootXmlNode, EXPERIMENT_DESIGN_ID, model.getId()); - addParameter(rootXmlNode, EXPERIMENT_DESIGN_AUTHOR, model.getAuthor()); - addParameter(rootXmlNode, EXPERIMENT_DESIGN_LICENCE, model.getLicence()); - - // description - String description = model.getDescription(); - if (StringUtils.isNotEmpty(description)) { - XmlNode.createElement(rootXmlNode, EXPERIMENT_DESIGN_DESCRIPTION, description); - } - } - - protected void composeFactors(XmlNode rootXmlNode) { - Collection<Factor> factors = model.getFactors(); - - // do nothing if no factors in model - if (factors.isEmpty()) { - return; - } - - // creating factors node - XmlNode factorsXmlNode = XmlNode.createElement(rootXmlNode, FACTORS); - for (Factor factor : factors) { - - // factor - XmlNode factorXmlNode = XmlNode.createElement(factorsXmlNode, FACTOR); - addParameter(factorXmlNode, FACTOR_ID, factor.getId()); - addParameter(factorXmlNode, FACTOR_NAME, factor.getName()); - addParameter(factorXmlNode, FACTOR_UNIT, factor.getUnit()); - - // description - String description = model.getDescription(); - if (StringUtils.isNotEmpty(description)) { - XmlNode.createElement(factorXmlNode, FACTOR_DESCRIPTION, factor.getDescription()); - } - - // domain - Domain domain = factor.getDomain(); - if (domain != null) { - XmlNode domainXmlNode = XmlNode.createElement(factorXmlNode, DOMAIN); - addParameter(domainXmlNode, DOMAIN_NAME, domain.getName()); - addParameter(domainXmlNode, DOMAIN_DISTRIBUTION_PARAMETER, domain.getDistributionParameter()); - addParameter(domainXmlNode, DOMAIN_LEVEL, String.valueOf(domain.getLevel())); - addParameter(domainXmlNode, DOMAIN_VALUE_TYPE, domain.getValueType()); - addParameter(domainXmlNode, DOMAIN_NOMINAL_VALUE, domain.getNominalValue()); - } - - // features - addAllFeature(factorXmlNode, factor.getFeatures()); - } - } -} Copied: masc/masc-api/src/main/java/fr/inra/masc/io/writer/ExperimentDesignXmlWriter.java (from rev 520, masc/masc-api/src/main/java/fr/inra/masc/io/writer/ExperienceDesignXmlWriter.java) =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/io/writer/ExperimentDesignXmlWriter.java (rev 0) +++ masc/masc-api/src/main/java/fr/inra/masc/io/writer/ExperimentDesignXmlWriter.java 2011-12-15 10:50:26 UTC (rev 521) @@ -0,0 +1,113 @@ +package fr.inra.masc.io.writer; + +import fr.ifremer.mexico.model.Domain; +import fr.ifremer.mexico.model.ExperimentDesign; +import fr.ifremer.mexico.model.Factor; +import org.apache.commons.lang3.StringUtils; + +import java.io.File; +import java.io.IOException; +import java.util.Collection; +import java.util.Date; + +import static fr.inra.masc.io.MexicoXmlConstant.DOMAIN; +import static fr.inra.masc.io.MexicoXmlConstant.DOMAIN_DISTRIBUTION_PARAMETER; +import static fr.inra.masc.io.MexicoXmlConstant.DOMAIN_LEVEL; +import static fr.inra.masc.io.MexicoXmlConstant.DOMAIN_NAME; +import static fr.inra.masc.io.MexicoXmlConstant.DOMAIN_NOMINAL_VALUE; +import static fr.inra.masc.io.MexicoXmlConstant.DOMAIN_VALUE_TYPE; +import static fr.inra.masc.io.MexicoXmlConstant.EXPERIMENT_DESIGN; +import static fr.inra.masc.io.MexicoXmlConstant.EXPERIMENT_DESIGN_AUTHOR; +import static fr.inra.masc.io.MexicoXmlConstant.EXPERIMENT_DESIGN_DATE; +import static fr.inra.masc.io.MexicoXmlConstant.EXPERIMENT_DESIGN_DESCRIPTION; +import static fr.inra.masc.io.MexicoXmlConstant.EXPERIMENT_DESIGN_ID; +import static fr.inra.masc.io.MexicoXmlConstant.EXPERIMENT_DESIGN_LICENCE; +import static fr.inra.masc.io.MexicoXmlConstant.FACTOR; +import static fr.inra.masc.io.MexicoXmlConstant.FACTORS; +import static fr.inra.masc.io.MexicoXmlConstant.FACTOR_DESCRIPTION; +import static fr.inra.masc.io.MexicoXmlConstant.FACTOR_ID; +import static fr.inra.masc.io.MexicoXmlConstant.FACTOR_NAME; +import static fr.inra.masc.io.MexicoXmlConstant.FACTOR_UNIT; + +/** + * Writer to create experiment design file with {@link ExperimentDesign} model + * + * @author sletellier <letellier@codelutin.com> + * @since 0.1 + */ +public class ExperimentDesignXmlWriter extends MexicoXmlWriter<ExperimentDesign> { + + public ExperimentDesignXmlWriter(File file, ExperimentDesign model) throws IOException { + super(file, model); + } + + @Override + public XmlNode getRootElement() { + + XmlNode rootXmlNode = new XmlNode(EXPERIMENT_DESIGN); + composeExperimentDesignMeta(rootXmlNode); + composeFactors(rootXmlNode); + + // TODO sletellier 2011/12/14 : implement workflow + // composeWorkFlow(rootXmlNode); + + return rootXmlNode; + } + + protected void composeExperimentDesignMeta(XmlNode rootXmlNode) { + + // date + Date date = model.getDate(); + addParameter(rootXmlNode, EXPERIMENT_DESIGN_DATE, formatDate(date)); + + addParameter(rootXmlNode, EXPERIMENT_DESIGN_ID, model.getId()); + addParameter(rootXmlNode, EXPERIMENT_DESIGN_AUTHOR, model.getAuthor()); + addParameter(rootXmlNode, EXPERIMENT_DESIGN_LICENCE, model.getLicence()); + + // description + String description = model.getDescription(); + if (StringUtils.isNotEmpty(description)) { + XmlNode.createElement(rootXmlNode, EXPERIMENT_DESIGN_DESCRIPTION, description); + } + } + + protected void composeFactors(XmlNode rootXmlNode) { + Collection<Factor> factors = model.getFactors(); + + // do nothing if no factors in model + if (factors.isEmpty()) { + return; + } + + // creating factors node + XmlNode factorsXmlNode = XmlNode.createElement(rootXmlNode, FACTORS); + for (Factor factor : factors) { + + // factor + XmlNode factorXmlNode = XmlNode.createElement(factorsXmlNode, FACTOR); + addParameter(factorXmlNode, FACTOR_ID, factor.getId()); + addParameter(factorXmlNode, FACTOR_NAME, factor.getName()); + addParameter(factorXmlNode, FACTOR_UNIT, factor.getUnit()); + + // description + String description = model.getDescription(); + if (StringUtils.isNotEmpty(description)) { + XmlNode.createElement(factorXmlNode, FACTOR_DESCRIPTION, factor.getDescription()); + } + + // domain + Domain domain = factor.getDomain(); + if (domain != null) { + XmlNode domainXmlNode = XmlNode.createElement(factorXmlNode, DOMAIN); + addParameter(domainXmlNode, DOMAIN_NAME, domain.getName()); + addParameter(domainXmlNode, DOMAIN_DISTRIBUTION_PARAMETER, domain.getDistributionParameter()); + addParameter(domainXmlNode, DOMAIN_LEVEL, String.valueOf(domain.getLevel())); + addParameter(domainXmlNode, DOMAIN_VALUE_TYPE, domain.getValueType()); + addParameter(domainXmlNode, DOMAIN_NOMINAL_VALUE, domain.getNominalValue()); + } + + // features + addAllFeature(factorXmlNode, factor.getFeatures()); + } + } +} Modified: masc/masc-api/src/main/java/fr/inra/masc/services/MexicoLoadModelService.java =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/services/MexicoLoadModelService.java 2011-12-15 10:31:40 UTC (rev 520) +++ masc/masc-api/src/main/java/fr/inra/masc/services/MexicoLoadModelService.java 2011-12-15 10:50:26 UTC (rev 521) @@ -1,8 +1,8 @@ package fr.inra.masc.services; -import fr.ifremer.mexico.model.ExperienceDesign; +import fr.ifremer.mexico.model.ExperimentDesign; import fr.ifremer.mexico.model.InputDesign; -import fr.inra.masc.io.parser.ExperienceDesignParser; +import fr.inra.masc.io.parser.ExperimentDesignParser; import fr.inra.masc.io.parser.InputDesignParser; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -26,29 +26,29 @@ return log; } - public ExperienceDesign loadExperienceDesignModel(File experienceDesignFile) { + public ExperimentDesign loadExperimentDesignModel(File experimentDesignFile) { - ExperienceDesign experienceDesignModel = null; + ExperimentDesign experimentDesign = null; try { - ExperienceDesignParser experienceDesignParser = new ExperienceDesignParser(experienceDesignFile); + ExperimentDesignParser experimentDesignParser = new ExperimentDesignParser(experimentDesignFile); try { - // parse experienceDesign - experienceDesignModel = experienceDesignParser.getModel(); + // parse experimentDesign + experimentDesign = experimentDesignParser.getModel(); } finally { - experienceDesignParser.close(); + experimentDesignParser.close(); } } catch (XmlPullParserException eee) { - throwMascTechnicalException("Failed to parse ExperienceDesign file '" + experienceDesignFile.getName() + "'", eee); + throwMascTechnicalException("Failed to parse ExperimentDesign file '" + experimentDesignFile.getName() + "'", eee); } catch (FileNotFoundException eee) { - throwMascTechnicalException("ExperienceDesign file '" + experienceDesignFile.getName() + "' not found", eee); + throwMascTechnicalException("ExperimentDesign file '" + experimentDesignFile.getName() + "' not found", eee); } catch (IOException eee) { - throwMascTechnicalException("Error reading ExperienceDesign file '" + experienceDesignFile.getName() + "'", eee); + throwMascTechnicalException("Error reading ExperimentDesign file '" + experimentDesignFile.getName() + "'", eee); } catch (ParseException eee) { - throwMascTechnicalException("Failed to parse ExperienceDesign file '" + experienceDesignFile.getName() + "'", eee); + throwMascTechnicalException("Failed to parse ExperimentDesign file '" + experimentDesignFile.getName() + "'", eee); } - return experienceDesignModel; + return experimentDesign; } public InputDesign loadInputDesignDesignModel(File inputDesignFile) { Modified: masc/masc-api/src/main/java/fr/inra/masc/services/MexicoModelConvertorService.java =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/services/MexicoModelConvertorService.java 2011-12-15 10:31:40 UTC (rev 520) +++ masc/masc-api/src/main/java/fr/inra/masc/services/MexicoModelConvertorService.java 2011-12-15 10:50:26 UTC (rev 521) @@ -2,8 +2,8 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.mexico.model.ExperienceDesign; -import fr.ifremer.mexico.model.ExperienceDesignImpl; +import fr.ifremer.mexico.model.ExperimentDesign; +import fr.ifremer.mexico.model.ExperimentDesignImpl; import fr.ifremer.mexico.model.Factor; import fr.ifremer.mexico.model.FactorImpl; import fr.ifremer.mexico.model.Feature; @@ -42,11 +42,11 @@ return log; } - public InputDesign convertMascModelToMexicoInputDesignModel(MascModel mascModel, ExperienceDesign experienceDesign) { + public InputDesign convertMascModelToMexicoInputDesignModel(MascModel mascModel, ExperimentDesign experimentDesign) { InputDesign inputDesign = new InputDesignImpl(); // experience design - inputDesign.setExperienceDesign(experienceDesign); + inputDesign.setExperimentDesign(experimentDesign); // date is now inputDesign.setDate(new Date()); @@ -70,7 +70,7 @@ // optionValue = entry of factorValues for (OptionValue optionValue : option.getOptionValue()) { - Collection<Factor> factors = experienceDesign.getFactors(); + Collection<Factor> factors = experimentDesign.getFactors(); for (Factor factor : factors) { String criteriaName = optionValue.getCriteria().getName(); if (factor.getId().equals(criteriaName)) { @@ -87,18 +87,18 @@ return inputDesign; } - public ExperienceDesign convertMascModelToMexicoExperienceDesignModel(MascModel mascModel) { - ExperienceDesign experienceDesign = new ExperienceDesignImpl(); + public ExperimentDesign convertMascModelToMexicoExperimentDesignModel(MascModel mascModel) { + ExperimentDesign experimentDesign = new ExperimentDesignImpl(); // id = mascModel name - experienceDesign.setId(mascModel.getName()); + experimentDesign.setId(mascModel.getName()); // description String description = StringUtils.join(mascModel.getDescription(), "\n"); - experienceDesign.setDescription(description); + experimentDesign.setDescription(description); // date is now - experienceDesign.setDate(new Date()); + experimentDesign.setDate(new Date()); // criterias = factors Collection<Criteria> criterias = mascModel.getCriteria(); @@ -107,9 +107,9 @@ for (Criteria criteria : criterias) { factors.addAll(getFactors(criteria)); } - experienceDesign.setFactors(factors); + experimentDesign.setFactors(factors); - return experienceDesign; + return experimentDesign; } protected Collection<Factor> getFactors(Criteria criteria) { Modified: masc/masc-api/src/main/java/fr/inra/masc/services/MexicoSaveModelService.java =================================================================== --- masc/masc-api/src/main/java/fr/inra/masc/services/MexicoSaveModelService.java 2011-12-15 10:31:40 UTC (rev 520) +++ masc/masc-api/src/main/java/fr/inra/masc/services/MexicoSaveModelService.java 2011-12-15 10:50:26 UTC (rev 521) @@ -1,8 +1,8 @@ package fr.inra.masc.services; -import fr.ifremer.mexico.model.ExperienceDesign; +import fr.ifremer.mexico.model.ExperimentDesign; import fr.ifremer.mexico.model.InputDesign; -import fr.inra.masc.io.writer.ExperienceDesignXmlWriter; +import fr.inra.masc.io.writer.ExperimentDesignXmlWriter; import fr.inra.masc.io.writer.InputDesignXmlWriter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -26,10 +26,10 @@ return log; } - public void saveExperienceDesign(ExperienceDesign experienceDesign, File toSave) { + public void saveExperimentDesign(ExperimentDesign experimentDesign, File toSave) { try { - ExperienceDesignXmlWriter writer = new ExperienceDesignXmlWriter(toSave, experienceDesign); + ExperimentDesignXmlWriter writer = new ExperimentDesignXmlWriter(toSave, experimentDesign); try { writer.write(); } finally { Modified: masc/masc-api/src/main/xmi/mexico.zargo =================================================================== (Binary files differ) Modified: masc/masc-api/src/test/java/fr/inra/masc/services/MexicoLoadModelServiceTest.java =================================================================== --- masc/masc-api/src/test/java/fr/inra/masc/services/MexicoLoadModelServiceTest.java 2011-12-15 10:31:40 UTC (rev 520) +++ masc/masc-api/src/test/java/fr/inra/masc/services/MexicoLoadModelServiceTest.java 2011-12-15 10:50:26 UTC (rev 521) @@ -1,6 +1,6 @@ package fr.inra.masc.services; -import fr.ifremer.mexico.model.ExperienceDesign; +import fr.ifremer.mexico.model.ExperimentDesign; import fr.ifremer.mexico.model.InputDesign; import fr.inra.masc.model.MascModel; import org.junit.Test; @@ -14,17 +14,17 @@ public class MexicoLoadModelServiceTest extends AbstractServiceTest { @Test - public void testLoadExperienceDesignModel() throws Exception { + public void testLoadExperimentDesignModel() throws Exception { MexicoModelConvertorService mexicoModelConvertorService = getService(MexicoModelConvertorService.class); File dexiTestFile = getDexiTestFile(); MascModel mascModel = getService(LoadModelService.class).loadModel(dexiTestFile); - ExperienceDesign experienceDesign = mexicoModelConvertorService.convertMascModelToMexicoExperienceDesignModel(mascModel); + ExperimentDesign experimentDesign = mexicoModelConvertorService.convertMascModelToMexicoExperimentDesignModel(mascModel); - File savedFile = new File(testWorkDir, "experienceDesignTestFileResult.xml"); - getService(MexicoSaveModelService.class).saveExperienceDesign(experienceDesign, savedFile); + File savedFile = new File(testWorkDir, "experimentDesignTestFileResult.xml"); + getService(MexicoSaveModelService.class).saveExperimentDesign(experimentDesign, savedFile); - ExperienceDesign loadedExperienceDesign = getService(MexicoLoadModelService.class).loadExperienceDesignModel(savedFile); - assertExperimentDesignEqual(experienceDesign, loadedExperienceDesign); + ExperimentDesign loadedExperimentDesign = getService(MexicoLoadModelService.class).loadExperimentDesignModel(savedFile); + assertExperimentDesignEqual(experimentDesign, loadedExperimentDesign); } @Test @@ -32,20 +32,20 @@ File dexiTestFile = getDexiTestFile(); MascModel mascModel = getService(LoadModelService.class).loadModel(dexiTestFile); MexicoModelConvertorService mexicoModelConvertorService = getService(MexicoModelConvertorService.class); - ExperienceDesign experienceDesign = mexicoModelConvertorService.convertMascModelToMexicoExperienceDesignModel(mascModel); - InputDesign inputDesign = mexicoModelConvertorService.convertMascModelToMexicoInputDesignModel(mascModel, experienceDesign); + ExperimentDesign experimentDesign = mexicoModelConvertorService.convertMascModelToMexicoExperimentDesignModel(mascModel); + InputDesign inputDesign = mexicoModelConvertorService.convertMascModelToMexicoInputDesignModel(mascModel, experimentDesign); File savedFile = new File(testWorkDir, "inputDesignTestFileResult.xml"); getService(MexicoSaveModelService.class).saveInputDesign(inputDesign, savedFile); InputDesign loadedInputDesign = getService(MexicoLoadModelService.class).loadInputDesignDesignModel(savedFile); - assertExperimentDesignEqual(inputDesign.getExperienceDesign(), loadedInputDesign.getExperienceDesign()); + assertExperimentDesignEqual(inputDesign.getExperimentDesign(), loadedInputDesign.getExperimentDesign()); assertEquals(inputDesign.getScenarios().size(), loadedInputDesign.getScenarios().size()); } - protected void assertExperimentDesignEqual(ExperienceDesign expectedExperienceDesign, ExperienceDesign experienceDesign) { - assertEquals(expectedExperienceDesign.getId(), experienceDesign.getId()); - assertEquals(expectedExperienceDesign.getFactors().size(), experienceDesign.getFactors().size()); + protected void assertExperimentDesignEqual(ExperimentDesign expectedExperimentDesign, ExperimentDesign experimentDesign) { + assertEquals(expectedExperimentDesign.getId(), experimentDesign.getId()); + assertEquals(expectedExperimentDesign.getFactors().size(), experimentDesign.getFactors().size()); } } Modified: masc/masc-api/src/test/java/fr/inra/masc/services/MexicoModelConvertorServiceTest.java =================================================================== --- masc/masc-api/src/test/java/fr/inra/masc/services/MexicoModelConvertorServiceTest.java 2011-12-15 10:31:40 UTC (rev 520) +++ masc/masc-api/src/test/java/fr/inra/masc/services/MexicoModelConvertorServiceTest.java 2011-12-15 10:50:26 UTC (rev 521) @@ -1,6 +1,6 @@ package fr.inra.masc.services; -import fr.ifremer.mexico.model.ExperienceDesign; +import fr.ifremer.mexico.model.ExperimentDesign; import fr.ifremer.mexico.model.InputDesign; import fr.ifremer.mexico.model.Scenario; import fr.inra.masc.model.Criteria; @@ -20,11 +20,11 @@ public class MexicoModelConvertorServiceTest extends AbstractServiceTest { @Test - public void testConvertMascModelToMexicoExperienceDesignModel() throws Exception { + public void testConvertMascModelToMexicoExperimentDesignModel() throws Exception { MexicoModelConvertorService mexicoModelConvertorService = getService(MexicoModelConvertorService.class); File dexiTestFile = getDexiTestFile(); MascModel mascModel = getService(LoadModelService.class).loadModel(dexiTestFile); - ExperienceDesign experienceDesign = mexicoModelConvertorService.convertMascModelToMexicoExperienceDesignModel(mascModel); + ExperimentDesign experimentDesign = mexicoModelConvertorService.convertMascModelToMexicoExperimentDesignModel(mascModel); // count masc model criteria Collection<Criteria> criterias = mascModel.getCriteria(); @@ -32,7 +32,7 @@ for (Criteria criteria : criterias) { count += countChildren(criteria); } - assertEquals(count, experienceDesign.getFactors().size()); + assertEquals(count, experimentDesign.getFactors().size()); } protected int countChildren(Criteria criteria) { @@ -53,8 +53,8 @@ File dexiTestFile = getDexiTestFile(); MascModel mascModel = getService(LoadModelService.class).loadModel(dexiTestFile); MexicoModelConvertorService mexicoModelConvertorService = getService(MexicoModelConvertorService.class); - ExperienceDesign experienceDesign = mexicoModelConvertorService.convertMascModelToMexicoExperienceDesignModel(mascModel); - InputDesign inputDesign = mexicoModelConvertorService.convertMascModelToMexicoInputDesignModel(mascModel, experienceDesign); + ExperimentDesign experimentDesign = mexicoModelConvertorService.convertMascModelToMexicoExperimentDesignModel(mascModel); + InputDesign inputDesign = mexicoModelConvertorService.convertMascModelToMexicoInputDesignModel(mascModel, experimentDesign); Collection<Option> options = mascModel.getOption(); assertEquals(options.size(), inputDesign.getScenarios().size()); Modified: masc/masc-api/src/test/java/fr/inra/masc/services/MexicoSaveModelServiceTest.java =================================================================== --- masc/masc-api/src/test/java/fr/inra/masc/services/MexicoSaveModelServiceTest.java 2011-12-15 10:31:40 UTC (rev 520) +++ masc/masc-api/src/test/java/fr/inra/masc/services/MexicoSaveModelServiceTest.java 2011-12-15 10:50:26 UTC (rev 521) @@ -1,6 +1,6 @@ package fr.inra.masc.services; -import fr.ifremer.mexico.model.ExperienceDesign; +import fr.ifremer.mexico.model.ExperimentDesign; import fr.ifremer.mexico.model.InputDesign; import fr.inra.masc.model.MascModel; import org.junit.Test; @@ -14,14 +14,14 @@ public class MexicoSaveModelServiceTest extends AbstractServiceTest { @Test - public void testSaveExperienceDesign() throws Exception { + public void testSaveExperimentDesign() throws Exception { MexicoModelConvertorService mexicoModelConvertorService = getService(MexicoModelConvertorService.class); File dexiTestFile = getDexiTestFile(); MascModel mascModel = getService(LoadModelService.class).loadModel(dexiTestFile); - ExperienceDesign experienceDesign = mexicoModelConvertorService.convertMascModelToMexicoExperienceDesignModel(mascModel); + ExperimentDesign experimentDesign = mexicoModelConvertorService.convertMascModelToMexicoExperimentDesignModel(mascModel); - File savedFile = new File(testWorkDir, "experienceDesignTestFileResult.xml"); - getService(MexicoSaveModelService.class).saveExperienceDesign(experienceDesign, savedFile); + File savedFile = new File(testWorkDir, "experimentDesignTestFileResult.xml"); + getService(MexicoSaveModelService.class).saveExperimentDesign(experimentDesign, savedFile); } @Test @@ -29,8 +29,8 @@ File dexiTestFile = getDexiTestFile(); MascModel mascModel = getService(LoadModelService.class).loadModel(dexiTestFile); MexicoModelConvertorService mexicoModelConvertorService = getService(MexicoModelConvertorService.class); - ExperienceDesign experienceDesign = mexicoModelConvertorService.convertMascModelToMexicoExperienceDesignModel(mascModel); - InputDesign inputDesign = mexicoModelConvertorService.convertMascModelToMexicoInputDesignModel(mascModel, experienceDesign); + ExperimentDesign experimentDesign = mexicoModelConvertorService.convertMascModelToMexicoExperimentDesignModel(mascModel); + InputDesign inputDesign = mexicoModelConvertorService.convertMascModelToMexicoInputDesignModel(mascModel, experimentDesign); File savedFile = new File(testWorkDir, "inputDesignTestFileResult.xml"); getService(MexicoSaveModelService.class).saveInputDesign(inputDesign, savedFile);