Menu
▾
▴
[sbml-svn] SF.net SVN: sbml:[26171] branches/libsbml-experimental/src/sbml/packages/ spatial/validator
|
From: <luc...@us...> - 2019-11-21 17:41:06
|
Revision: 26171
http://sourceforge.net/p/sbml/code/26171
Author: luciansmith
Date: 2019-11-21 17:41:01 +0000 (Thu, 21 Nov 2019)
Log Message:
-----------
Collapse spatial rules 21750-21752 into a single rule; add a new 21751.
Modified Paths:
--------------
branches/libsbml-experimental/src/sbml/packages/spatial/validator/SpatialSBMLError.h
branches/libsbml-experimental/src/sbml/packages/spatial/validator/SpatialSBMLErrorTable.h
branches/libsbml-experimental/src/sbml/packages/spatial/validator/constraints/SpatialConsistencyConstraints.cpp
branches/libsbml-experimental/src/sbml/packages/spatial/validator/constraints/SpatialConsistencyConstraintsDeclared.cxx
Added Paths:
-----------
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221750-fail-01-02.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221750-fail-01-03.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221750-fail-01-04.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221750-fail-01-05.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221750-fail-01-06.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221750-pass-00-02.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221751-fail-01-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221751-pass-00-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221751-pass-00-02.xml
Removed Paths:
-------------
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221751-fail-01-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221751-pass-00-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221752-fail-01-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221752-fail-01-02.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221752-fail-01-03.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221752-fail-01-04.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221752-pass-00-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221752-pass-00-02.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221753-fail-01-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221753-pass-00-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221753-pass-00-02.xml
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/SpatialSBMLError.h
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/SpatialSBMLError.h 2019-11-21 00:51:29 UTC (rev 26170)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/SpatialSBMLError.h 2019-11-21 17:41:01 UTC (rev 26171)
@@ -172,10 +172,9 @@
, SpatialSampledVolumeSampledValueMustBeDouble = 1221706
, SpatialSampledVolumeMinValueMustBeDouble = 1221707
, SpatialSampledVolumeMaxValueMustBeDouble = 1221708
-, SpatialSampledVolumeNeedsMaxWithMin = 1221750
-, SpatialSampledVolumeNeedsMinWithMax = 1221751
-, SpatialSampledVolumeSampledValueMinMax = 1221752
-, SpatialSampledVolumeMinLessThanMax = 1221753
+, SpatialSampledVolumeSampledValueMinMax = 1221750
+, SpatialSampledVolumeMinLessThanMax = 1221751
+, SpatialSampledVolumeValuesMustDiffer = 1221752
, SpatialAnalyticGeometryAllowedCoreAttributes = 1221801
, SpatialAnalyticGeometryAllowedCoreElements = 1221802
, SpatialAnalyticGeometryAllowedElements = 1221803
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/SpatialSBMLErrorTable.h
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/SpatialSBMLErrorTable.h 2019-11-21 00:51:29 UTC (rev 26170)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/SpatialSBMLErrorTable.h 2019-11-21 17:41:01 UTC (rev 26171)
@@ -1339,45 +1339,35 @@
},
// 1221750
- { SpatialSampledVolumeNeedsMaxWithMin,
- "A 'minValue' attribute goes with the 'maxValue' attribute.",
+ { SpatialSampledVolumeSampledValueMinMax,
+ "Every <sampleVolume> must have a 'sampledValue' attribute or the 'min' and 'max' attributes.",
LIBSBML_CAT_GENERAL_CONSISTENCY,
LIBSBML_SEV_ERROR,
- "A <sampledVolume> with a defined 'spatial:minValue' attribute must also define the 'spatial:maxValue' attribute.",
+ "A <sampledVolume> must either define the attribute 'spatial:sampledValue' or must define both the 'spatial:minValue' and 'spatial:maxValue' attributes, but may not define any other combination of those three attributes.",
{ "L3V1 Spatial V1 Section"
}
},
// 1221751
- { SpatialSampledVolumeNeedsMinWithMax,
- "A 'maxValue' attribute goes with the 'minValue' attribute.",
+ { SpatialSampledVolumeMinLessThanMax,
+ "A <sampleVolume> 'minValue' must be less than or equal to the 'maxValue'.",
LIBSBML_CAT_GENERAL_CONSISTENCY,
LIBSBML_SEV_ERROR,
- "A <sampledVolume> with a defined 'spatial:maxValue' attribute must also define the 'spatial:minValue' attribute.",
+ "The attribute 'minValue' of a <sampledVolume> must have a value less than or equal to the value of the 'maxValue' attribute of that <sampledVolume>.",
{ "L3V1 Spatial V1 Section"
}
},
// 1221752
- { SpatialSampledVolumeSampledValueMinMax,
- "Every <sampleVolume> must have a 'sampledValue' attribute or the 'min' and 'max' attributes.",
+ { SpatialSampledVolumeValuesMustDiffer,
+ "Every <sampleVolume> 'sampledValue' must be unique.",
LIBSBML_CAT_GENERAL_CONSISTENCY,
LIBSBML_SEV_ERROR,
- "A <sampledVolume> must either define the attribute 'spatial:sampledValue' or must define both the 'spatial:minValue' and 'spatial:maxValue' attributes, but may not define any other combination of those three attributes.",
+ "A 'sampledValue' from one <sampledVolume> may not be the same as a different 'sampledValue' from another <sampledVolume> from the same <sampledFieldGeometry>.",
{ "L3V1 Spatial V1 Section"
}
},
- // 1221753
- { SpatialSampledVolumeMinLessThanMax,
- "A <sampleVolume> 'minValue' must be less than or equal to the 'maxValue'.",
- LIBSBML_CAT_GENERAL_CONSISTENCY,
- LIBSBML_SEV_ERROR,
- "The attribute 'minValue' of a <sampledVolume> must have a value less than or equal to the value of the 'maxValue' attribute of that <sampledVolume>.",
- { "L3V1 Spatial V1 Section"
- }
- },
-
// 1221801
{ SpatialAnalyticGeometryAllowedCoreAttributes,
"Core attributes allowed on <analyticGeometry>.",
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/constraints/SpatialConsistencyConstraints.cpp
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/constraints/SpatialConsistencyConstraints.cpp 2019-11-21 00:51:29 UTC (rev 26170)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/constraints/SpatialConsistencyConstraints.cpp 2019-11-21 17:41:01 UTC (rev 26171)
@@ -38,6 +38,7 @@
* ------------------------------------------------------------------------ -->
*/
#ifndef AddingConstraintsToValidator
+#include <set>
#include <sbml/validator/VConstraint.h>
@@ -538,7 +539,7 @@
// 1221750
-START_CONSTRAINT(SpatialSampledVolumeNeedsMaxWithMin, SampledVolume, svol)
+START_CONSTRAINT(SpatialSampledVolumeSampledValueMinMax, SampledVolume, svol)
{
bool fail = false;
if (svol.isSetMinValue() && !svol.isSetMaxValue() && !svol.isSetSampledValue()) {
@@ -553,16 +554,7 @@
msg = ss_msg.str();
}
- inv(fail == false);
-}
-END_CONSTRAINT
-
-
-// 1221751
-START_CONSTRAINT(SpatialSampledVolumeNeedsMinWithMax, SampledVolume, svol)
-{
- bool fail = false;
- if (svol.isSetMaxValue() && !svol.isSetMinValue() && !svol.isSetSampledValue()) {
+ else if (svol.isSetMaxValue() && !svol.isSetMinValue() && !svol.isSetSampledValue()) {
fail = true;
stringstream ss_msg;
ss_msg << "A SampledVolume";
@@ -574,16 +566,7 @@
msg = ss_msg.str();
}
- inv(fail == false);
-}
-END_CONSTRAINT
-
-
-// 1221752
-START_CONSTRAINT(SpatialSampledVolumeSampledValueMinMax, SampledVolume, svol)
-{
- bool fail = false;
- if (svol.isSetMaxValue() && svol.isSetMinValue() && svol.isSetSampledValue()) {
+ else if (svol.isSetMaxValue() && svol.isSetMinValue() && svol.isSetSampledValue()) {
fail = true;
stringstream ss_msg;
ss_msg << "A SampledVolume";
@@ -1345,7 +1328,7 @@
ss_msg << svol.getMaxValue();
ss_msg << "', which is less than '";
ss_msg << svol.getMinValue();
- ss_msg << "', the value of the attribute 'spatial:minValue'";
+ ss_msg << "', the value of the attribute 'spatial:minValue'.";
msg = ss_msg.str();
fail = true;
@@ -1356,6 +1339,46 @@
END_CONSTRAINT
+// 1221751
+START_CONSTRAINT(SpatialSampledVolumeValuesMustDiffer, SampledFieldGeometry, sfg)
+{
+ bool fail = false;
+ set<double> values;
+ msg = "";
+ for (unsigned long sv = 0; sv < sfg.getNumSampledVolumes(); sv++) {
+ const SampledVolume* svol = sfg.getSampledVolume(sv);
+ if (svol->isSetSampledValue()) {
+ double val = svol->getSampledValue();
+ if (values.find(val) != values.end()) {
+ stringstream ss_msg;
+ if (!msg.empty()) {
+ ss_msg << endl << "Also: a";
+ }
+ else {
+ ss_msg << "A";
+ }
+ ss_msg << " <sampledVolume>";
+ if (svol->isSetId())
+ {
+ ss_msg << " with id '" << svol->getId() << "'";
+ }
+ ss_msg << " has a 'spatial:sampledValue' attribute of '";
+ ss_msg << svol->getSampledValue();
+ ss_msg << "', which another <sampledVolume> already has.";
+ msg = ss_msg.str();
+ fail = true;
+
+ }
+ values.insert(val);
+ }
+ }
+
+
+ inv(fail == false);
+}
+END_CONSTRAINT
+
+
// 122__
//START_CONSTRAINT(Spatial, Class, class)
//{
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/constraints/SpatialConsistencyConstraintsDeclared.cxx
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/constraints/SpatialConsistencyConstraintsDeclared.cxx 2019-11-21 00:51:29 UTC (rev 26170)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/constraints/SpatialConsistencyConstraintsDeclared.cxx 2019-11-21 17:41:01 UTC (rev 26171)
@@ -59,8 +59,6 @@
addConstraint(new VConstraintSampledFieldSpatialSampledFieldOneSampleIn1DGeometry(*this));
addConstraint(new VConstraintSampledFieldSpatialSampledFieldTwoSamplesIn2DGeometry(*this));
addConstraint(new VConstraintSampledFieldSpatialSampledFieldThreeSamplesIn3DGeometry(*this));
-addConstraint(new VConstraintSampledVolumeSpatialSampledVolumeNeedsMaxWithMin(*this));
-addConstraint(new VConstraintSampledVolumeSpatialSampledVolumeNeedsMinWithMax(*this));
addConstraint(new VConstraintSampledVolumeSpatialSampledVolumeSampledValueMinMax(*this));
addConstraint(new VConstraintCompartmentMappingSpatialCompartmentMappingUnitSizeMustBeFraction(*this));
addConstraint(new VConstraintSpeciesSpatialCompartmentsMustHaveCompartmentMapping(*this));
@@ -82,6 +80,7 @@
addConstraint(new VConstraintInteriorPointSpatialInteriorPointThreeCoordsIn3DGeometry(*this));
addConstraint(new VConstraintAdjacentDomainsSpatialAdjacentDomainsMustBeAdjacent(*this));
addConstraint(new VConstraintSampledVolumeSpatialSampledVolumeMinLessThanMax(*this));
+addConstraint(new VConstraintSampledFieldGeometrySpatialSampledVolumeValuesMustDiffer(*this));
//Constraints defined in their own class ('global constraints')
addConstraint(new SpatialCompartmentMappingUnitSizesCheck(SpatialCompartmentMappingUnitSizesSum, *this));
Copied: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221750-fail-01-02.xml (from rev 26170, branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221751-fail-01-01.xml)
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221750-fail-01-02.xml (rev 0)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221750-fail-01-02.xml 2019-11-21 17:41:01 UTC (rev 26171)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml level="3" spatial:required="true" version="1" xmlns="http://www.sbml.org/sbml/level3/version1/core" xmlns:spatial="http://www.sbml.org/sbml/level3/version1/spatial/version1">
+ <model>
+ <spatial:geometry spatial:coordinateSystem="cartesian" spatial:id="geometry_1">
+ <spatial:listOfCoordinateComponents>
+ <spatial:coordinateComponent spatial:id="coordinateComponent_1" spatial:type="cartesianX" spatial:unit="dimensionless">
+ <spatial:boundaryMin spatial:id="boundary_1" spatial:value="0"/>
+ <spatial:boundaryMax spatial:id="boundary_2" spatial:value="1"/>
+ </spatial:coordinateComponent>
+ </spatial:listOfCoordinateComponents>
+ <spatial:listOfDomainTypes>
+ <spatial:domainType spatial:id="domainType_1" spatial:spatialDimensions="1"/>
+ </spatial:listOfDomainTypes>
+ <spatial:listOfGeometryDefinitions>
+ <spatial:sampledFieldGeometry spatial:id="geometryDefinition_2" spatial:isActive="false" spatial:sampledField="sampledField_1">
+ <spatial:listOfSampledVolumes>
+ <spatial:sampledVolume spatial:domainType="domainType_1" spatial:id="sampledVolume_1" spatial:maxValue="0.5"/>
+ </spatial:listOfSampledVolumes>
+ </spatial:sampledFieldGeometry>
+ </spatial:listOfGeometryDefinitions>
+ <spatial:listOfSampledFields>
+ <spatial:sampledField spatial:compression="uncompressed" spatial:dataType="double" spatial:id="sampledField_1" spatial:interpolationType="nearestNeighbor" spatial:numSamples1="3" spatial:samplesLength="3">0 0 1</spatial:sampledField>
+ </spatial:listOfSampledFields>
+ </spatial:geometry>
+ </model>
+</sbml>
Copied: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221750-fail-01-03.xml (from rev 26170, branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221752-fail-01-01.xml)
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221750-fail-01-03.xml (rev 0)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221750-fail-01-03.xml 2019-11-21 17:41:01 UTC (rev 26171)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml level="3" spatial:required="true" version="1" xmlns="http://www.sbml.org/sbml/level3/version1/core" xmlns:spatial="http://www.sbml.org/sbml/level3/version1/spatial/version1">
+ <model>
+ <spatial:geometry spatial:coordinateSystem="cartesian" spatial:id="geometry_1">
+ <spatial:listOfCoordinateComponents>
+ <spatial:coordinateComponent spatial:id="coordinateComponent_1" spatial:type="cartesianX" spatial:unit="dimensionless">
+ <spatial:boundaryMin spatial:id="boundary_1" spatial:value="0"/>
+ <spatial:boundaryMax spatial:id="boundary_2" spatial:value="1"/>
+ </spatial:coordinateComponent>
+ </spatial:listOfCoordinateComponents>
+ <spatial:listOfDomainTypes>
+ <spatial:domainType spatial:id="domainType_1" spatial:spatialDimensions="1"/>
+ </spatial:listOfDomainTypes>
+ <spatial:listOfGeometryDefinitions>
+ <spatial:sampledFieldGeometry spatial:id="geometryDefinition_2" spatial:isActive="false" spatial:sampledField="sampledField_1">
+ <spatial:listOfSampledVolumes>
+ <spatial:sampledVolume spatial:domainType="domainType_1" spatial:id="sampledVolume_1" spatial:minValue="0" spatial:maxValue="0.5" spatial:sampledValue="0"/>
+ </spatial:listOfSampledVolumes>
+ </spatial:sampledFieldGeometry>
+ </spatial:listOfGeometryDefinitions>
+ <spatial:listOfSampledFields>
+ <spatial:sampledField spatial:compression="uncompressed" spatial:dataType="double" spatial:id="sampledField_1" spatial:interpolationType="nearestNeighbor" spatial:numSamples1="3" spatial:samplesLength="3">0 0 1</spatial:sampledField>
+ </spatial:listOfSampledFields>
+ </spatial:geometry>
+ </model>
+</sbml>
Copied: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221750-fail-01-04.xml (from rev 26170, branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221752-fail-01-02.xml)
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221750-fail-01-04.xml (rev 0)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221750-fail-01-04.xml 2019-11-21 17:41:01 UTC (rev 26171)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml level="3" spatial:required="true" version="1" xmlns="http://www.sbml.org/sbml/level3/version1/core" xmlns:spatial="http://www.sbml.org/sbml/level3/version1/spatial/version1">
+ <model>
+ <spatial:geometry spatial:coordinateSystem="cartesian" spatial:id="geometry_1">
+ <spatial:listOfCoordinateComponents>
+ <spatial:coordinateComponent spatial:id="coordinateComponent_1" spatial:type="cartesianX" spatial:unit="dimensionless">
+ <spatial:boundaryMin spatial:id="boundary_1" spatial:value="0"/>
+ <spatial:boundaryMax spatial:id="boundary_2" spatial:value="1"/>
+ </spatial:coordinateComponent>
+ </spatial:listOfCoordinateComponents>
+ <spatial:listOfDomainTypes>
+ <spatial:domainType spatial:id="domainType_1" spatial:spatialDimensions="1"/>
+ </spatial:listOfDomainTypes>
+ <spatial:listOfGeometryDefinitions>
+ <spatial:sampledFieldGeometry spatial:id="geometryDefinition_2" spatial:isActive="false" spatial:sampledField="sampledField_1">
+ <spatial:listOfSampledVolumes>
+ <spatial:sampledVolume spatial:domainType="domainType_1" spatial:id="sampledVolume_1" spatial:minValue="0" spatial:sampledValue="0"/>
+ </spatial:listOfSampledVolumes>
+ </spatial:sampledFieldGeometry>
+ </spatial:listOfGeometryDefinitions>
+ <spatial:listOfSampledFields>
+ <spatial:sampledField spatial:compression="uncompressed" spatial:dataType="double" spatial:id="sampledField_1" spatial:interpolationType="nearestNeighbor" spatial:numSamples1="3" spatial:samplesLength="3">0 0 1</spatial:sampledField>
+ </spatial:listOfSampledFields>
+ </spatial:geometry>
+ </model>
+</sbml>
Copied: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221750-fail-01-05.xml (from rev 26170, branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221752-fail-01-03.xml)
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221750-fail-01-05.xml (rev 0)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221750-fail-01-05.xml 2019-11-21 17:41:01 UTC (rev 26171)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml level="3" spatial:required="true" version="1" xmlns="http://www.sbml.org/sbml/level3/version1/core" xmlns:spatial="http://www.sbml.org/sbml/level3/version1/spatial/version1">
+ <model>
+ <spatial:geometry spatial:coordinateSystem="cartesian" spatial:id="geometry_1">
+ <spatial:listOfCoordinateComponents>
+ <spatial:coordinateComponent spatial:id="coordinateComponent_1" spatial:type="cartesianX" spatial:unit="dimensionless">
+ <spatial:boundaryMin spatial:id="boundary_1" spatial:value="0"/>
+ <spatial:boundaryMax spatial:id="boundary_2" spatial:value="1"/>
+ </spatial:coordinateComponent>
+ </spatial:listOfCoordinateComponents>
+ <spatial:listOfDomainTypes>
+ <spatial:domainType spatial:id="domainType_1" spatial:spatialDimensions="1"/>
+ </spatial:listOfDomainTypes>
+ <spatial:listOfGeometryDefinitions>
+ <spatial:sampledFieldGeometry spatial:id="geometryDefinition_2" spatial:isActive="false" spatial:sampledField="sampledField_1">
+ <spatial:listOfSampledVolumes>
+ <spatial:sampledVolume spatial:domainType="domainType_1" spatial:id="sampledVolume_1" spatial:maxValue="0.5" spatial:sampledValue="0"/>
+ </spatial:listOfSampledVolumes>
+ </spatial:sampledFieldGeometry>
+ </spatial:listOfGeometryDefinitions>
+ <spatial:listOfSampledFields>
+ <spatial:sampledField spatial:compression="uncompressed" spatial:dataType="double" spatial:id="sampledField_1" spatial:interpolationType="nearestNeighbor" spatial:numSamples1="3" spatial:samplesLength="3">0 0 1</spatial:sampledField>
+ </spatial:listOfSampledFields>
+ </spatial:geometry>
+ </model>
+</sbml>
Copied: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221750-fail-01-06.xml (from rev 26170, branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221752-fail-01-04.xml)
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221750-fail-01-06.xml (rev 0)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221750-fail-01-06.xml 2019-11-21 17:41:01 UTC (rev 26171)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml level="3" spatial:required="true" version="1" xmlns="http://www.sbml.org/sbml/level3/version1/core" xmlns:spatial="http://www.sbml.org/sbml/level3/version1/spatial/version1">
+ <model>
+ <spatial:geometry spatial:coordinateSystem="cartesian" spatial:id="geometry_1">
+ <spatial:listOfCoordinateComponents>
+ <spatial:coordinateComponent spatial:id="coordinateComponent_1" spatial:type="cartesianX" spatial:unit="dimensionless">
+ <spatial:boundaryMin spatial:id="boundary_1" spatial:value="0"/>
+ <spatial:boundaryMax spatial:id="boundary_2" spatial:value="1"/>
+ </spatial:coordinateComponent>
+ </spatial:listOfCoordinateComponents>
+ <spatial:listOfDomainTypes>
+ <spatial:domainType spatial:id="domainType_1" spatial:spatialDimensions="1"/>
+ </spatial:listOfDomainTypes>
+ <spatial:listOfGeometryDefinitions>
+ <spatial:sampledFieldGeometry spatial:id="geometryDefinition_2" spatial:isActive="false" spatial:sampledField="sampledField_1">
+ <spatial:listOfSampledVolumes>
+ <spatial:sampledVolume spatial:domainType="domainType_1" spatial:id="sampledVolume_1"/>
+ </spatial:listOfSampledVolumes>
+ </spatial:sampledFieldGeometry>
+ </spatial:listOfGeometryDefinitions>
+ <spatial:listOfSampledFields>
+ <spatial:sampledField spatial:compression="uncompressed" spatial:dataType="double" spatial:id="sampledField_1" spatial:interpolationType="nearestNeighbor" spatial:numSamples1="3" spatial:samplesLength="3">0 0 1</spatial:sampledField>
+ </spatial:listOfSampledFields>
+ </spatial:geometry>
+ </model>
+</sbml>
Copied: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221750-pass-00-02.xml (from rev 26170, branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221752-pass-00-02.xml)
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221750-pass-00-02.xml (rev 0)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221750-pass-00-02.xml 2019-11-21 17:41:01 UTC (rev 26171)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml level="3" spatial:required="true" version="1" xmlns="http://www.sbml.org/sbml/level3/version1/core" xmlns:spatial="http://www.sbml.org/sbml/level3/version1/spatial/version1">
+ <model>
+ <spatial:geometry spatial:coordinateSystem="cartesian" spatial:id="geometry_1">
+ <spatial:listOfCoordinateComponents>
+ <spatial:coordinateComponent spatial:id="coordinateComponent_1" spatial:type="cartesianX" spatial:unit="dimensionless">
+ <spatial:boundaryMin spatial:id="boundary_1" spatial:value="0"/>
+ <spatial:boundaryMax spatial:id="boundary_2" spatial:value="1"/>
+ </spatial:coordinateComponent>
+ </spatial:listOfCoordinateComponents>
+ <spatial:listOfDomainTypes>
+ <spatial:domainType spatial:id="domainType_1" spatial:spatialDimensions="1"/>
+ </spatial:listOfDomainTypes>
+ <spatial:listOfGeometryDefinitions>
+ <spatial:sampledFieldGeometry spatial:id="geometryDefinition_2" spatial:isActive="false" spatial:sampledField="sampledField_1">
+ <spatial:listOfSampledVolumes>
+ <spatial:sampledVolume spatial:domainType="domainType_1" spatial:id="sampledVolume_1" spatial:sampledValue="0"/>
+ </spatial:listOfSampledVolumes>
+ </spatial:sampledFieldGeometry>
+ </spatial:listOfGeometryDefinitions>
+ <spatial:listOfSampledFields>
+ <spatial:sampledField spatial:compression="uncompressed" spatial:dataType="double" spatial:id="sampledField_1" spatial:interpolationType="nearestNeighbor" spatial:numSamples1="3" spatial:samplesLength="3">0 0 1</spatial:sampledField>
+ </spatial:listOfSampledFields>
+ </spatial:geometry>
+ </model>
+</sbml>
Deleted: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221751-fail-01-01.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221751-fail-01-01.xml 2019-11-21 00:51:29 UTC (rev 26170)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221751-fail-01-01.xml 2019-11-21 17:41:01 UTC (rev 26171)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sbml level="3" spatial:required="true" version="1" xmlns="http://www.sbml.org/sbml/level3/version1/core" xmlns:spatial="http://www.sbml.org/sbml/level3/version1/spatial/version1">
- <model>
- <spatial:geometry spatial:coordinateSystem="cartesian" spatial:id="geometry_1">
- <spatial:listOfCoordinateComponents>
- <spatial:coordinateComponent spatial:id="coordinateComponent_1" spatial:type="cartesianX" spatial:unit="dimensionless">
- <spatial:boundaryMin spatial:id="boundary_1" spatial:value="0"/>
- <spatial:boundaryMax spatial:id="boundary_2" spatial:value="1"/>
- </spatial:coordinateComponent>
- </spatial:listOfCoordinateComponents>
- <spatial:listOfDomainTypes>
- <spatial:domainType spatial:id="domainType_1" spatial:spatialDimensions="1"/>
- </spatial:listOfDomainTypes>
- <spatial:listOfGeometryDefinitions>
- <spatial:sampledFieldGeometry spatial:id="geometryDefinition_2" spatial:isActive="false" spatial:sampledField="sampledField_1">
- <spatial:listOfSampledVolumes>
- <spatial:sampledVolume spatial:domainType="domainType_1" spatial:id="sampledVolume_1" spatial:maxValue="0.5"/>
- </spatial:listOfSampledVolumes>
- </spatial:sampledFieldGeometry>
- </spatial:listOfGeometryDefinitions>
- <spatial:listOfSampledFields>
- <spatial:sampledField spatial:compression="uncompressed" spatial:dataType="double" spatial:id="sampledField_1" spatial:interpolationType="nearestNeighbor" spatial:numSamples1="3" spatial:samplesLength="3">0 0 1</spatial:sampledField>
- </spatial:listOfSampledFields>
- </spatial:geometry>
- </model>
-</sbml>
Copied: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221751-fail-01-01.xml (from rev 26170, branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221753-fail-01-01.xml)
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221751-fail-01-01.xml (rev 0)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221751-fail-01-01.xml 2019-11-21 17:41:01 UTC (rev 26171)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml level="3" spatial:required="true" version="1" xmlns="http://www.sbml.org/sbml/level3/version1/core" xmlns:spatial="http://www.sbml.org/sbml/level3/version1/spatial/version1">
+ <model>
+ <spatial:geometry spatial:coordinateSystem="cartesian" spatial:id="geometry_1">
+ <spatial:listOfCoordinateComponents>
+ <spatial:coordinateComponent spatial:id="coordinateComponent_1" spatial:type="cartesianX" spatial:unit="dimensionless">
+ <spatial:boundaryMin spatial:id="boundary_1" spatial:value="0"/>
+ <spatial:boundaryMax spatial:id="boundary_2" spatial:value="1"/>
+ </spatial:coordinateComponent>
+ </spatial:listOfCoordinateComponents>
+ <spatial:listOfDomainTypes>
+ <spatial:domainType spatial:id="domainType_1" spatial:spatialDimensions="1"/>
+ </spatial:listOfDomainTypes>
+ <spatial:listOfGeometryDefinitions>
+ <spatial:sampledFieldGeometry spatial:id="geometryDefinition_2" spatial:isActive="false" spatial:sampledField="sampledField_1">
+ <spatial:listOfSampledVolumes>
+ <spatial:sampledVolume spatial:domainType="domainType_1" spatial:id="sampledVolume_1" spatial:minValue="0.5" spatial:maxValue="0"/>
+ </spatial:listOfSampledVolumes>
+ </spatial:sampledFieldGeometry>
+ </spatial:listOfGeometryDefinitions>
+ <spatial:listOfSampledFields>
+ <spatial:sampledField spatial:compression="uncompressed" spatial:dataType="double" spatial:id="sampledField_1" spatial:interpolationType="nearestNeighbor" spatial:numSamples1="3" spatial:samplesLength="3">0 0 1</spatial:sampledField>
+ </spatial:listOfSampledFields>
+ </spatial:geometry>
+ </model>
+</sbml>
Deleted: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221751-pass-00-01.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221751-pass-00-01.xml 2019-11-21 00:51:29 UTC (rev 26170)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221751-pass-00-01.xml 2019-11-21 17:41:01 UTC (rev 26171)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sbml level="3" spatial:required="true" version="1" xmlns="http://www.sbml.org/sbml/level3/version1/core" xmlns:spatial="http://www.sbml.org/sbml/level3/version1/spatial/version1">
- <model>
- <spatial:geometry spatial:coordinateSystem="cartesian" spatial:id="geometry_1">
- <spatial:listOfCoordinateComponents>
- <spatial:coordinateComponent spatial:id="coordinateComponent_1" spatial:type="cartesianX" spatial:unit="dimensionless">
- <spatial:boundaryMin spatial:id="boundary_1" spatial:value="0"/>
- <spatial:boundaryMax spatial:id="boundary_2" spatial:value="1"/>
- </spatial:coordinateComponent>
- </spatial:listOfCoordinateComponents>
- <spatial:listOfDomainTypes>
- <spatial:domainType spatial:id="domainType_1" spatial:spatialDimensions="1"/>
- </spatial:listOfDomainTypes>
- <spatial:listOfGeometryDefinitions>
- <spatial:sampledFieldGeometry spatial:id="geometryDefinition_2" spatial:isActive="false" spatial:sampledField="sampledField_1">
- <spatial:listOfSampledVolumes>
- <spatial:sampledVolume spatial:domainType="domainType_1" spatial:id="sampledVolume_1" spatial:minValue="0" spatial:maxValue="0.5"/>
- </spatial:listOfSampledVolumes>
- </spatial:sampledFieldGeometry>
- </spatial:listOfGeometryDefinitions>
- <spatial:listOfSampledFields>
- <spatial:sampledField spatial:compression="uncompressed" spatial:dataType="double" spatial:id="sampledField_1" spatial:interpolationType="nearestNeighbor" spatial:numSamples1="3" spatial:samplesLength="3">0 0 1</spatial:sampledField>
- </spatial:listOfSampledFields>
- </spatial:geometry>
- </model>
-</sbml>
Copied: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221751-pass-00-01.xml (from rev 26170, branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221753-pass-00-01.xml)
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221751-pass-00-01.xml (rev 0)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221751-pass-00-01.xml 2019-11-21 17:41:01 UTC (rev 26171)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml level="3" spatial:required="true" version="1" xmlns="http://www.sbml.org/sbml/level3/version1/core" xmlns:spatial="http://www.sbml.org/sbml/level3/version1/spatial/version1">
+ <model>
+ <spatial:geometry spatial:coordinateSystem="cartesian" spatial:id="geometry_1">
+ <spatial:listOfCoordinateComponents>
+ <spatial:coordinateComponent spatial:id="coordinateComponent_1" spatial:type="cartesianX" spatial:unit="dimensionless">
+ <spatial:boundaryMin spatial:id="boundary_1" spatial:value="0"/>
+ <spatial:boundaryMax spatial:id="boundary_2" spatial:value="1"/>
+ </spatial:coordinateComponent>
+ </spatial:listOfCoordinateComponents>
+ <spatial:listOfDomainTypes>
+ <spatial:domainType spatial:id="domainType_1" spatial:spatialDimensions="1"/>
+ </spatial:listOfDomainTypes>
+ <spatial:listOfGeometryDefinitions>
+ <spatial:sampledFieldGeometry spatial:id="geometryDefinition_2" spatial:isActive="false" spatial:sampledField="sampledField_1">
+ <spatial:listOfSampledVolumes>
+ <spatial:sampledVolume spatial:domainType="domainType_1" spatial:id="sampledVolume_1" spatial:minValue="0" spatial:maxValue="0.5"/>
+ </spatial:listOfSampledVolumes>
+ </spatial:sampledFieldGeometry>
+ </spatial:listOfGeometryDefinitions>
+ <spatial:listOfSampledFields>
+ <spatial:sampledField spatial:compression="uncompressed" spatial:dataType="double" spatial:id="sampledField_1" spatial:interpolationType="nearestNeighbor" spatial:numSamples1="3" spatial:samplesLength="3">0 0 1</spatial:sampledField>
+ </spatial:listOfSampledFields>
+ </spatial:geometry>
+ </model>
+</sbml>
Copied: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221751-pass-00-02.xml (from rev 26170, branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221753-pass-00-02.xml)
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221751-pass-00-02.xml (rev 0)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221751-pass-00-02.xml 2019-11-21 17:41:01 UTC (rev 26171)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml level="3" spatial:required="true" version="1" xmlns="http://www.sbml.org/sbml/level3/version1/core" xmlns:spatial="http://www.sbml.org/sbml/level3/version1/spatial/version1">
+ <model>
+ <spatial:geometry spatial:coordinateSystem="cartesian" spatial:id="geometry_1">
+ <spatial:listOfCoordinateComponents>
+ <spatial:coordinateComponent spatial:id="coordinateComponent_1" spatial:type="cartesianX" spatial:unit="dimensionless">
+ <spatial:boundaryMin spatial:id="boundary_1" spatial:value="0"/>
+ <spatial:boundaryMax spatial:id="boundary_2" spatial:value="1"/>
+ </spatial:coordinateComponent>
+ </spatial:listOfCoordinateComponents>
+ <spatial:listOfDomainTypes>
+ <spatial:domainType spatial:id="domainType_1" spatial:spatialDimensions="1"/>
+ </spatial:listOfDomainTypes>
+ <spatial:listOfGeometryDefinitions>
+ <spatial:sampledFieldGeometry spatial:id="geometryDefinition_2" spatial:isActive="false" spatial:sampledField="sampledField_1">
+ <spatial:listOfSampledVolumes>
+ <spatial:sampledVolume spatial:domainType="domainType_1" spatial:id="sampledVolume_1" spatial:minValue="0.5" spatial:maxValue="0.5"/>
+ </spatial:listOfSampledVolumes>
+ </spatial:sampledFieldGeometry>
+ </spatial:listOfGeometryDefinitions>
+ <spatial:listOfSampledFields>
+ <spatial:sampledField spatial:compression="uncompressed" spatial:dataType="double" spatial:id="sampledField_1" spatial:interpolationType="nearestNeighbor" spatial:numSamples1="3" spatial:samplesLength="3">0 0 1</spatial:sampledField>
+ </spatial:listOfSampledFields>
+ </spatial:geometry>
+ </model>
+</sbml>
Deleted: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221752-fail-01-01.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221752-fail-01-01.xml 2019-11-21 00:51:29 UTC (rev 26170)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221752-fail-01-01.xml 2019-11-21 17:41:01 UTC (rev 26171)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sbml level="3" spatial:required="true" version="1" xmlns="http://www.sbml.org/sbml/level3/version1/core" xmlns:spatial="http://www.sbml.org/sbml/level3/version1/spatial/version1">
- <model>
- <spatial:geometry spatial:coordinateSystem="cartesian" spatial:id="geometry_1">
- <spatial:listOfCoordinateComponents>
- <spatial:coordinateComponent spatial:id="coordinateComponent_1" spatial:type="cartesianX" spatial:unit="dimensionless">
- <spatial:boundaryMin spatial:id="boundary_1" spatial:value="0"/>
- <spatial:boundaryMax spatial:id="boundary_2" spatial:value="1"/>
- </spatial:coordinateComponent>
- </spatial:listOfCoordinateComponents>
- <spatial:listOfDomainTypes>
- <spatial:domainType spatial:id="domainType_1" spatial:spatialDimensions="1"/>
- </spatial:listOfDomainTypes>
- <spatial:listOfGeometryDefinitions>
- <spatial:sampledFieldGeometry spatial:id="geometryDefinition_2" spatial:isActive="false" spatial:sampledField="sampledField_1">
- <spatial:listOfSampledVolumes>
- <spatial:sampledVolume spatial:domainType="domainType_1" spatial:id="sampledVolume_1" spatial:minValue="0" spatial:maxValue="0.5" spatial:sampledValue="0"/>
- </spatial:listOfSampledVolumes>
- </spatial:sampledFieldGeometry>
- </spatial:listOfGeometryDefinitions>
- <spatial:listOfSampledFields>
- <spatial:sampledField spatial:compression="uncompressed" spatial:dataType="double" spatial:id="sampledField_1" spatial:interpolationType="nearestNeighbor" spatial:numSamples1="3" spatial:samplesLength="3">0 0 1</spatial:sampledField>
- </spatial:listOfSampledFields>
- </spatial:geometry>
- </model>
-</sbml>
Deleted: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221752-fail-01-02.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221752-fail-01-02.xml 2019-11-21 00:51:29 UTC (rev 26170)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221752-fail-01-02.xml 2019-11-21 17:41:01 UTC (rev 26171)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sbml level="3" spatial:required="true" version="1" xmlns="http://www.sbml.org/sbml/level3/version1/core" xmlns:spatial="http://www.sbml.org/sbml/level3/version1/spatial/version1">
- <model>
- <spatial:geometry spatial:coordinateSystem="cartesian" spatial:id="geometry_1">
- <spatial:listOfCoordinateComponents>
- <spatial:coordinateComponent spatial:id="coordinateComponent_1" spatial:type="cartesianX" spatial:unit="dimensionless">
- <spatial:boundaryMin spatial:id="boundary_1" spatial:value="0"/>
- <spatial:boundaryMax spatial:id="boundary_2" spatial:value="1"/>
- </spatial:coordinateComponent>
- </spatial:listOfCoordinateComponents>
- <spatial:listOfDomainTypes>
- <spatial:domainType spatial:id="domainType_1" spatial:spatialDimensions="1"/>
- </spatial:listOfDomainTypes>
- <spatial:listOfGeometryDefinitions>
- <spatial:sampledFieldGeometry spatial:id="geometryDefinition_2" spatial:isActive="false" spatial:sampledField="sampledField_1">
- <spatial:listOfSampledVolumes>
- <spatial:sampledVolume spatial:domainType="domainType_1" spatial:id="sampledVolume_1" spatial:minValue="0" spatial:sampledValue="0"/>
- </spatial:listOfSampledVolumes>
- </spatial:sampledFieldGeometry>
- </spatial:listOfGeometryDefinitions>
- <spatial:listOfSampledFields>
- <spatial:sampledField spatial:compression="uncompressed" spatial:dataType="double" spatial:id="sampledField_1" spatial:interpolationType="nearestNeighbor" spatial:numSamples1="3" spatial:samplesLength="3">0 0 1</spatial:sampledField>
- </spatial:listOfSampledFields>
- </spatial:geometry>
- </model>
-</sbml>
Deleted: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221752-fail-01-03.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221752-fail-01-03.xml 2019-11-21 00:51:29 UTC (rev 26170)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221752-fail-01-03.xml 2019-11-21 17:41:01 UTC (rev 26171)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sbml level="3" spatial:required="true" version="1" xmlns="http://www.sbml.org/sbml/level3/version1/core" xmlns:spatial="http://www.sbml.org/sbml/level3/version1/spatial/version1">
- <model>
- <spatial:geometry spatial:coordinateSystem="cartesian" spatial:id="geometry_1">
- <spatial:listOfCoordinateComponents>
- <spatial:coordinateComponent spatial:id="coordinateComponent_1" spatial:type="cartesianX" spatial:unit="dimensionless">
- <spatial:boundaryMin spatial:id="boundary_1" spatial:value="0"/>
- <spatial:boundaryMax spatial:id="boundary_2" spatial:value="1"/>
- </spatial:coordinateComponent>
- </spatial:listOfCoordinateComponents>
- <spatial:listOfDomainTypes>
- <spatial:domainType spatial:id="domainType_1" spatial:spatialDimensions="1"/>
- </spatial:listOfDomainTypes>
- <spatial:listOfGeometryDefinitions>
- <spatial:sampledFieldGeometry spatial:id="geometryDefinition_2" spatial:isActive="false" spatial:sampledField="sampledField_1">
- <spatial:listOfSampledVolumes>
- <spatial:sampledVolume spatial:domainType="domainType_1" spatial:id="sampledVolume_1" spatial:maxValue="0.5" spatial:sampledValue="0"/>
- </spatial:listOfSampledVolumes>
- </spatial:sampledFieldGeometry>
- </spatial:listOfGeometryDefinitions>
- <spatial:listOfSampledFields>
- <spatial:sampledField spatial:compression="uncompressed" spatial:dataType="double" spatial:id="sampledField_1" spatial:interpolationType="nearestNeighbor" spatial:numSamples1="3" spatial:samplesLength="3">0 0 1</spatial:sampledField>
- </spatial:listOfSampledFields>
- </spatial:geometry>
- </model>
-</sbml>
Deleted: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221752-fail-01-04.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221752-fail-01-04.xml 2019-11-21 00:51:29 UTC (rev 26170)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221752-fail-01-04.xml 2019-11-21 17:41:01 UTC (rev 26171)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sbml level="3" spatial:required="true" version="1" xmlns="http://www.sbml.org/sbml/level3/version1/core" xmlns:spatial="http://www.sbml.org/sbml/level3/version1/spatial/version1">
- <model>
- <spatial:geometry spatial:coordinateSystem="cartesian" spatial:id="geometry_1">
- <spatial:listOfCoordinateComponents>
- <spatial:coordinateComponent spatial:id="coordinateComponent_1" spatial:type="cartesianX" spatial:unit="dimensionless">
- <spatial:boundaryMin spatial:id="boundary_1" spatial:value="0"/>
- <spatial:boundaryMax spatial:id="boundary_2" spatial:value="1"/>
- </spatial:coordinateComponent>
- </spatial:listOfCoordinateComponents>
- <spatial:listOfDomainTypes>
- <spatial:domainType spatial:id="domainType_1" spatial:spatialDimensions="1"/>
- </spatial:listOfDomainTypes>
- <spatial:listOfGeometryDefinitions>
- <spatial:sampledFieldGeometry spatial:id="geometryDefinition_2" spatial:isActive="false" spatial:sampledField="sampledField_1">
- <spatial:listOfSampledVolumes>
- <spatial:sampledVolume spatial:domainType="domainType_1" spatial:id="sampledVolume_1"/>
- </spatial:listOfSampledVolumes>
- </spatial:sampledFieldGeometry>
- </spatial:listOfGeometryDefinitions>
- <spatial:listOfSampledFields>
- <spatial:sampledField spatial:compression="uncompressed" spatial:dataType="double" spatial:id="sampledField_1" spatial:interpolationType="nearestNeighbor" spatial:numSamples1="3" spatial:samplesLength="3">0 0 1</spatial:sampledField>
- </spatial:listOfSampledFields>
- </spatial:geometry>
- </model>
-</sbml>
Deleted: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221752-pass-00-01.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221752-pass-00-01.xml 2019-11-21 00:51:29 UTC (rev 26170)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221752-pass-00-01.xml 2019-11-21 17:41:01 UTC (rev 26171)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sbml level="3" spatial:required="true" version="1" xmlns="http://www.sbml.org/sbml/level3/version1/core" xmlns:spatial="http://www.sbml.org/sbml/level3/version1/spatial/version1">
- <model>
- <spatial:geometry spatial:coordinateSystem="cartesian" spatial:id="geometry_1">
- <spatial:listOfCoordinateComponents>
- <spatial:coordinateComponent spatial:id="coordinateComponent_1" spatial:type="cartesianX" spatial:unit="dimensionless">
- <spatial:boundaryMin spatial:id="boundary_1" spatial:value="0"/>
- <spatial:boundaryMax spatial:id="boundary_2" spatial:value="1"/>
- </spatial:coordinateComponent>
- </spatial:listOfCoordinateComponents>
- <spatial:listOfDomainTypes>
- <spatial:domainType spatial:id="domainType_1" spatial:spatialDimensions="1"/>
- </spatial:listOfDomainTypes>
- <spatial:listOfGeometryDefinitions>
- <spatial:sampledFieldGeometry spatial:id="geometryDefinition_2" spatial:isActive="false" spatial:sampledField="sampledField_1">
- <spatial:listOfSampledVolumes>
- <spatial:sampledVolume spatial:domainType="domainType_1" spatial:id="sampledVolume_1" spatial:minValue="0" spatial:maxValue="0.5"/>
- </spatial:listOfSampledVolumes>
- </spatial:sampledFieldGeometry>
- </spatial:listOfGeometryDefinitions>
- <spatial:listOfSampledFields>
- <spatial:sampledField spatial:compression="uncompressed" spatial:dataType="double" spatial:id="sampledField_1" spatial:interpolationType="nearestNeighbor" spatial:numSamples1="3" spatial:samplesLength="3">0 0 1</spatial:sampledField>
- </spatial:listOfSampledFields>
- </spatial:geometry>
- </model>
-</sbml>
Deleted: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221752-pass-00-02.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221752-pass-00-02.xml 2019-11-21 00:51:29 UTC (rev 26170)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221752-pass-00-02.xml 2019-11-21 17:41:01 UTC (rev 26171)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sbml level="3" spatial:required="true" version="1" xmlns="http://www.sbml.org/sbml/level3/version1/core" xmlns:spatial="http://www.sbml.org/sbml/level3/version1/spatial/version1">
- <model>
- <spatial:geometry spatial:coordinateSystem="cartesian" spatial:id="geometry_1">
- <spatial:listOfCoordinateComponents>
- <spatial:coordinateComponent spatial:id="coordinateComponent_1" spatial:type="cartesianX" spatial:unit="dimensionless">
- <spatial:boundaryMin spatial:id="boundary_1" spatial:value="0"/>
- <spatial:boundaryMax spatial:id="boundary_2" spatial:value="1"/>
- </spatial:coordinateComponent>
- </spatial:listOfCoordinateComponents>
- <spatial:listOfDomainTypes>
- <spatial:domainType spatial:id="domainType_1" spatial:spatialDimensions="1"/>
- </spatial:listOfDomainTypes>
- <spatial:listOfGeometryDefinitions>
- <spatial:sampledFieldGeometry spatial:id="geometryDefinition_2" spatial:isActive="false" spatial:sampledField="sampledField_1">
- <spatial:listOfSampledVolumes>
- <spatial:sampledVolume spatial:domainType="domainType_1" spatial:id="sampledVolume_1" spatial:sampledValue="0"/>
- </spatial:listOfSampledVolumes>
- </spatial:sampledFieldGeometry>
- </spatial:listOfGeometryDefinitions>
- <spatial:listOfSampledFields>
- <spatial:sampledField spatial:compression="uncompressed" spatial:dataType="double" spatial:id="sampledField_1" spatial:interpolationType="nearestNeighbor" spatial:numSamples1="3" spatial:samplesLength="3">0 0 1</spatial:sampledField>
- </spatial:listOfSampledFields>
- </spatial:geometry>
- </model>
-</sbml>
Deleted: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221753-fail-01-01.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221753-fail-01-01.xml 2019-11-21 00:51:29 UTC (rev 26170)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221753-fail-01-01.xml 2019-11-21 17:41:01 UTC (rev 26171)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sbml level="3" spatial:required="true" version="1" xmlns="http://www.sbml.org/sbml/level3/version1/core" xmlns:spatial="http://www.sbml.org/sbml/level3/version1/spatial/version1">
- <model>
- <spatial:geometry spatial:coordinateSystem="cartesian" spatial:id="geometry_1">
- <spatial:listOfCoordinateComponents>
- <spatial:coordinateComponent spatial:id="coordinateComponent_1" spatial:type="cartesianX" spatial:unit="dimensionless">
- <spatial:boundaryMin spatial:id="boundary_1" spatial:value="0"/>
- <spatial:boundaryMax spatial:id="boundary_2" spatial:value="1"/>
- </spatial:coordinateComponent>
- </spatial:listOfCoordinateComponents>
- <spatial:listOfDomainTypes>
- <spatial:domainType spatial:id="domainType_1" spatial:spatialDimensions="1"/>
- </spatial:listOfDomainTypes>
- <spatial:listOfGeometryDefinitions>
- <spatial:sampledFieldGeometry spatial:id="geometryDefinition_2" spatial:isActive="false" spatial:sampledField="sampledField_1">
- <spatial:listOfSampledVolumes>
- <spatial:sampledVolume spatial:domainType="domainType_1" spatial:id="sampledVolume_1" spatial:minValue="0.5" spatial:maxValue="0"/>
- </spatial:listOfSampledVolumes>
- </spatial:sampledFieldGeometry>
- </spatial:listOfGeometryDefinitions>
- <spatial:listOfSampledFields>
- <spatial:sampledField spatial:compression="uncompressed" spatial:dataType="double" spatial:id="sampledField_1" spatial:interpolationType="nearestNeighbor" spatial:numSamples1="3" spatial:samplesLength="3">0 0 1</spatial:sampledField>
- </spatial:listOfSampledFields>
- </spatial:geometry>
- </model>
-</sbml>
Deleted: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221753-pass-00-01.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221753-pass-00-01.xml 2019-11-21 00:51:29 UTC (rev 26170)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221753-pass-00-01.xml 2019-11-21 17:41:01 UTC (rev 26171)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sbml level="3" spatial:required="true" version="1" xmlns="http://www.sbml.org/sbml/level3/version1/core" xmlns:spatial="http://www.sbml.org/sbml/level3/version1/spatial/version1">
- <model>
- <spatial:geometry spatial:coordinateSystem="cartesian" spatial:id="geometry_1">
- <spatial:listOfCoordinateComponents>
- <spatial:coordinateComponent spatial:id="coordinateComponent_1" spatial:type="cartesianX" spatial:unit="dimensionless">
- <spatial:boundaryMin spatial:id="boundary_1" spatial:value="0"/>
- <spatial:boundaryMax spatial:id="boundary_2" spatial:value="1"/>
- </spatial:coordinateComponent>
- </spatial:listOfCoordinateComponents>
- <spatial:listOfDomainTypes>
- <spatial:domainType spatial:id="domainType_1" spatial:spatialDimensions="1"/>
- </spatial:listOfDomainTypes>
- <spatial:listOfGeometryDefinitions>
- <spatial:sampledFieldGeometry spatial:id="geometryDefinition_2" spatial:isActive="false" spatial:sampledField="sampledField_1">
- <spatial:listOfSampledVolumes>
- <spatial:sampledVolume spatial:domainType="domainType_1" spatial:id="sampledVolume_1" spatial:minValue="0" spatial:maxValue="0.5"/>
- </spatial:listOfSampledVolumes>
- </spatial:sampledFieldGeometry>
- </spatial:listOfGeometryDefinitions>
- <spatial:listOfSampledFields>
- <spatial:sampledField spatial:compression="uncompressed" spatial:dataType="double" spatial:id="sampledField_1" spatial:interpolationType="nearestNeighbor" spatial:numSamples1="3" spatial:samplesLength="3">0 0 1</spatial:sampledField>
- </spatial:listOfSampledFields>...
[truncated message content] |
