Menu
▾
▴
[sbml-svn] SF.net SVN: sbml:[26168] branches/libsbml-experimental/src/sbml/packages/ spatial/validator
|
From: <luc...@us...> - 2019-11-21 00:20:54
|
Revision: 26168
http://sourceforge.net/p/sbml/code/26168
Author: luciansmith
Date: 2019-11-21 00:20:51 +0000 (Thu, 21 Nov 2019)
Log Message:
-----------
Add partial support for spatial rule 21150, and fix the five billion old models that violated it.
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
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220301-fail-01-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220301-pass-00-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-02.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-03.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-04.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-05.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-06.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-07.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-08.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-09.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-10.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-pass-00-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-pass-00-02.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-pass-00-03.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-pass-00-04.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221101-fail-01-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221101-pass-00-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221101-pass-00-02.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221101-pass-00-03.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221102-pass-00-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221102-pass-00-02.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221102-pass-00-03.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221103-fail-01-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221103-fail-01-02.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221103-fail-01-03.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221103-fail-01-04.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221103-pass-00-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221104-fail-01-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221104-pass-00-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221105-fail-01-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221105-pass-00-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221201-fail-01-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221201-pass-00-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221201-pass-00-02.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221201-pass-00-03.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221202-pass-00-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221202-pass-00-02.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221202-pass-00-03.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221203-fail-01-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221203-fail-01-02.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221203-fail-01-03.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221203-pass-00-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221204-fail-01-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221204-pass-00-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223304-fail-01-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223304-fail-01-02.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223304-fail-01-03.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223304-pass-00-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223304-pass-00-02.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223304-pass-00-03.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223304-pass-00-04.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223304-pass-00-05.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223304-pass-00-06.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223350-fail-01-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223350-fail-02-02.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223350-pass-00-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223450-fail-01-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223450-fail-01-02.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223450-fail-01-03.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223450-pass-00-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223451-fail-01-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223451-fail-01-02.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223451-fail-01-03.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223451-pass-00-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223452-fail-01-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223452-fail-01-02.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223452-fail-01-03.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223452-pass-00-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223454-fail-01-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223454-pass-00-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223504-fail-01-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223504-pass-00-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223551-fail-01-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223551-pass-00-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223551-pass-00-02.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223551-pass-00-03.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223604-fail-01-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223604-pass-00-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223651-fail-01-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223651-fail-01-02.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223651-fail-01-03.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223651-fail-01-04.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223651-fail-01-05.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223651-fail-01-06.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223651-fail-01-07.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223651-fail-01-08.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223651-fail-01-09.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223651-fail-01-10.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223651-fail-01-11.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223651-fail-01-12.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223651-fail-01-13.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223651-fail-01-14.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223651-fail-01-15.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223651-fail-01-16.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223651-fail-01-17.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223651-fail-01-18.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223651-fail-02-19.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223651-fail-02-20.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223651-fail-02-21.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223651-pass-00-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223651-pass-00-02.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1223651-pass-00-03.xml
Added Paths:
-----------
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221150-fail-01-01.xml
branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221150-pass-00-01.xml
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/SpatialSBMLError.h
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/SpatialSBMLError.h 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/SpatialSBMLError.h 2019-11-21 00:20:51 UTC (rev 26168)
@@ -120,6 +120,7 @@
, SpatialAdjacentDomainsDomain1MustBeDomain = 1221104
, SpatialAdjacentDomainsDomain2MustBeDomain = 1221105
, SpatialAdjacentDomainsNameMustBeString = 1221106
+, SpatialAdjacentDomainsMustBeAdjacent = 1221150
, SpatialGeometryDefinitionAllowedCoreAttributes = 1221201
, SpatialGeometryDefinitionAllowedCoreElements = 1221202
, SpatialGeometryDefinitionAllowedAttributes = 1221203
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/SpatialSBMLErrorTable.h
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/SpatialSBMLErrorTable.h 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/SpatialSBMLErrorTable.h 2019-11-21 00:20:51 UTC (rev 26168)
@@ -722,6 +722,16 @@
}
},
+ // 1221150
+ { SpatialAdjacentDomainsMustBeAdjacent,
+ "The domains in AdjacentDomains must be adjacent.",
+ LIBSBML_CAT_GENERAL_CONSISTENCY,
+ LIBSBML_SEV_ERROR,
+ "The attributes 'domain1' and 'domain2' of an <adjacentDomains> must reference two different domains that are spatially adjacent.",
+ { "L3V1 Spatial V1 Section"
+ }
+ },
+
// 1221201
{ SpatialGeometryDefinitionAllowedCoreAttributes,
"Core attributes allowed on <geometryDefinition>.",
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-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/constraints/SpatialConsistencyConstraints.cpp 2019-11-21 00:20:51 UTC (rev 26168)
@@ -1301,6 +1301,33 @@
END_CONSTRAINT
+// 1221150
+START_CONSTRAINT(SpatialAdjacentDomainsMustBeAdjacent, AdjacentDomains, adom)
+{
+ bool fail = false;
+ pre(adom.isSetDomain1());
+ pre(adom.isSetDomain2());
+ if (adom.getDomain1() == adom.getDomain2()) {
+ msg = "An <adjacentDomain>";
+ if (adom.isSetId())
+ {
+ msg += " with id '" + adom.getId() + "'";
+ }
+ msg += " defines both 'domain1' and 'domain2' to be '";
+ msg += adom.getDomain1() + "'.";
+ fail = true;
+ }
+
+ //NOTE: It would be fantastic if we could actually measure space and figure out if these
+ // domains were adjacent, but that's well well beyond the capabilities of this
+ // software. Other spatially-aware simulators can test this themselves and use this error
+ // ID to report it, if they want.
+
+ 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-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/constraints/SpatialConsistencyConstraintsDeclared.cxx 2019-11-21 00:20:51 UTC (rev 26168)
@@ -80,9 +80,10 @@
addConstraint(new VConstraintInteriorPointSpatialInteriorPointOneCoordIn1DGeometry(*this));
addConstraint(new VConstraintInteriorPointSpatialInteriorPointTwoCoordsIn2DGeometry(*this));
addConstraint(new VConstraintInteriorPointSpatialInteriorPointThreeCoordsIn3DGeometry(*this));
+addConstraint(new VConstraintAdjacentDomainsSpatialAdjacentDomainsMustBeAdjacent(*this));
//Constraints defined in their own class ('global constraints')
-addConstraint(new SpatialCompartmentMappingUnitSizesCheck(1221351, *this));
+addConstraint(new SpatialCompartmentMappingUnitSizesCheck(SpatialCompartmentMappingUnitSizesSum, *this));
addConstraint(new SpatialSpatialSymbolReferenceUniqueRefCheck(SpatialSpatialSymbolReferenceUniqueRef, *this));
addConstraint(new SpatialUniqueDiffusionCoefficientsCheck(SpatialNoDiffusionCoefficientOverlap, *this));
addConstraint(new SpatialUniqueAdvectionCoefficientsCheck(SpatialAdvectionCoefficientsMustBeUnique, *this));
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220301-fail-01-01.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220301-fail-01-01.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220301-fail-01-01.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -26,9 +26,9 @@
</spatial:listOfInteriorPoints>
</spatial:domain>
</spatial:listOfDomains>
- <spatial:listOfAdjacentDomains>
- <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_1" spatial:id="adjacentDomains_1"/>
- </spatial:listOfAdjacentDomains>
+
+
+
<spatial:listOfGeometryDefinitions>
<spatial:analyticGeometry spatial:id="geometryDefinition_1" spatial:isActive="false">
<spatial:listOfAnalyticVolumes>
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220301-pass-00-01.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220301-pass-00-01.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220301-pass-00-01.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -26,9 +26,9 @@
</spatial:listOfInteriorPoints>
</spatial:domain>
</spatial:listOfDomains>
- <spatial:listOfAdjacentDomains>
- <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_1" spatial:id="adjacentDomains_1"/>
- </spatial:listOfAdjacentDomains>
+
+
+
<spatial:listOfGeometryDefinitions>
<spatial:analyticGeometry spatial:id="geometryDefinition_1" spatial:isActive="false">
<spatial:listOfAnalyticVolumes>
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-01.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-01.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-01.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -26,9 +26,9 @@
</spatial:listOfInteriorPoints>
</spatial:domain>
</spatial:listOfDomains>
- <spatial:listOfAdjacentDomains>
- <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_1" spatial:id="adjacentDomains_1"/>
- </spatial:listOfAdjacentDomains>
+
+
+
<spatial:listOfGeometryDefinitions>
<spatial:analyticGeometry spatial:id="geometryDefinition_1" spatial:isActive="false">
<spatial:listOfAnalyticVolumes>
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-02.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-02.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-02.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -26,9 +26,9 @@
</spatial:listOfInteriorPoints>
</spatial:domain>
</spatial:listOfDomains>
- <spatial:listOfAdjacentDomains>
- <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_1" spatial:id="adjacentDomains_1"/>
- </spatial:listOfAdjacentDomains>
+
+
+
<spatial:listOfGeometryDefinitions>
<spatial:analyticGeometry spatial:id="geometryDefinition_1" spatial:isActive="false">
<spatial:listOfAnalyticVolumes>
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-03.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-03.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-03.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -26,9 +26,9 @@
</spatial:listOfInteriorPoints>
</spatial:domain>
</spatial:listOfDomains>
- <spatial:listOfAdjacentDomains>
- <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_1" spatial:id="adjacentDomains_1"/>
- </spatial:listOfAdjacentDomains>
+
+
+
<spatial:listOfGeometryDefinitions>
<spatial:analyticGeometry spatial:id="geometryDefinition_1" spatial:isActive="false">
<spatial:listOfAnalyticVolumes>
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-04.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-04.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-04.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -26,9 +26,9 @@
</spatial:listOfInteriorPoints>
</spatial:domain>
</spatial:listOfDomains>
- <spatial:listOfAdjacentDomains>
- <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_1" spatial:id="adjacentDomains_1"/>
- </spatial:listOfAdjacentDomains>
+
+
+
<spatial:listOfGeometryDefinitions>
<spatial:analyticGeometry spatial:id="geometryDefinition_1" spatial:isActive="false">
<spatial:listOfAnalyticVolumes>
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-05.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-05.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-05.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -26,9 +26,9 @@
</spatial:listOfInteriorPoints>
</spatial:domain>
</spatial:listOfDomains>
- <spatial:listOfAdjacentDomains>
- <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_1" spatial:id="adjacentDomains_1"/>
- </spatial:listOfAdjacentDomains>
+
+
+
<spatial:listOfGeometryDefinitions>
<spatial:analyticGeometry spatial:id="geometryDefinition_1" spatial:isActive="false">
<spatial:listOfAnalyticVolumes>
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-06.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-06.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-06.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -26,9 +26,9 @@
</spatial:listOfInteriorPoints>
</spatial:domain>
</spatial:listOfDomains>
- <spatial:listOfAdjacentDomains>
- <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_1" spatial:id="adjacentDomains_1"/>
- </spatial:listOfAdjacentDomains>
+
+
+
<spatial:listOfGeometryDefinitions>
<spatial:analyticGeometry spatial:id="geometryDefinition_1" spatial:isActive="false">
<spatial:listOfAnalyticVolumes>
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-07.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-07.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-07.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -26,9 +26,9 @@
</spatial:listOfInteriorPoints>
</spatial:domain>
</spatial:listOfDomains>
- <spatial:listOfAdjacentDomains>
- <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_1" spatial:id="adjacentDomains_1"/>
- </spatial:listOfAdjacentDomains>
+
+
+
<spatial:listOfGeometryDefinitions>
<spatial:analyticGeometry spatial:id="geometryDefinition_1" spatial:isActive="false">
<spatial:listOfAnalyticVolumes>
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-08.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-08.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-08.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -26,9 +26,9 @@
</spatial:listOfInteriorPoints>
</spatial:domain>
</spatial:listOfDomains>
- <spatial:listOfAdjacentDomains>
- <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_1" spatial:id="adjacentDomains_1"/>
- </spatial:listOfAdjacentDomains>
+
+
+
<spatial:listOfGeometryDefinitions>
<spatial:analyticGeometry spatial:id="geometryDefinition_1" spatial:isActive="false">
<spatial:listOfAnalyticVolumes>
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-09.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-09.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-09.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -26,9 +26,9 @@
</spatial:listOfInteriorPoints>
</spatial:domain>
</spatial:listOfDomains>
- <spatial:listOfAdjacentDomains>
- <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_1" spatial:id="adjacentDomains_1"/>
- </spatial:listOfAdjacentDomains>
+
+
+
<spatial:listOfGeometryDefinitions>
<spatial:analyticGeometry spatial:id="geometryDefinition_1" spatial:isActive="false">
<spatial:listOfAnalyticVolumes>
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-10.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-10.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-fail-01-10.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -26,9 +26,9 @@
</spatial:listOfInteriorPoints>
</spatial:domain>
</spatial:listOfDomains>
- <spatial:listOfAdjacentDomains>
- <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_1" spatial:id="adjacentDomains_1"/>
- </spatial:listOfAdjacentDomains>
+
+
+
<spatial:listOfGeometryDefinitions>
<spatial:analyticGeometry spatial:id="geometryDefinition_1" spatial:isActive="false">
<spatial:listOfAnalyticVolumes>
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-pass-00-01.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-pass-00-01.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-pass-00-01.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -26,9 +26,9 @@
</spatial:listOfInteriorPoints>
</spatial:domain>
</spatial:listOfDomains>
- <spatial:listOfAdjacentDomains>
- <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_1" spatial:id="adjacentDomains_1"/>
- </spatial:listOfAdjacentDomains>
+
+
+
<spatial:listOfGeometryDefinitions>
<spatial:analyticGeometry spatial:id="geometryDefinition_1" spatial:isActive="false">
<spatial:listOfAnalyticVolumes>
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-pass-00-02.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-pass-00-02.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-pass-00-02.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -26,9 +26,9 @@
</spatial:listOfInteriorPoints>
</spatial:domain>
</spatial:listOfDomains>
- <spatial:listOfAdjacentDomains>
- <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_1" spatial:id="adjacentDomains_1"/>
- </spatial:listOfAdjacentDomains>
+
+
+
<spatial:listOfGeometryDefinitions>
<spatial:analyticGeometry spatial:id="geometryDefinition_1" spatial:isActive="false">
<spatial:listOfAnalyticVolumes>
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-pass-00-03.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-pass-00-03.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-pass-00-03.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -26,9 +26,9 @@
</spatial:listOfInteriorPoints>
</spatial:domain>
</spatial:listOfDomains>
- <spatial:listOfAdjacentDomains>
- <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_1" spatial:id="adjacentDomains_1"/>
- </spatial:listOfAdjacentDomains>
+
+
+
<spatial:listOfGeometryDefinitions>
<spatial:analyticGeometry spatial:id="geometryDefinition_1" spatial:isActive="false">
<spatial:listOfAnalyticVolumes>
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-pass-00-04.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-pass-00-04.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1220501-pass-00-04.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -26,9 +26,9 @@
</spatial:listOfInteriorPoints>
</spatial:domain>
</spatial:listOfDomains>
- <spatial:listOfAdjacentDomains>
- <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_1" spatial:id="adjacentDomains_1"/>
- </spatial:listOfAdjacentDomains>
+
+
+
<spatial:listOfGeometryDefinitions>
<spatial:analyticGeometry spatial:id="geometryDefinition_1" spatial:isActive="false">
<spatial:listOfAnalyticVolumes>
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221101-fail-01-01.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221101-fail-01-01.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221101-fail-01-01.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -25,9 +25,14 @@
<spatial:interiorPoint spatial:coord1="0" spatial:coord2="0" spatial:coord3="0"/>
</spatial:listOfInteriorPoints>
</spatial:domain>
+ <spatial:domain spatial:domainType="domainType_1" spatial:id="domain_2">
+ <spatial:listOfInteriorPoints>
+ <spatial:interiorPoint spatial:coord1="0.5" spatial:coord2="0.5" spatial:coord3="0.5"/>
+ </spatial:listOfInteriorPoints>
+ </spatial:domain>
</spatial:listOfDomains>
<spatial:listOfAdjacentDomains>
- <spatial:adjacentDomains foo="someString" spatial:domain1="domain_1" spatial:domain2="domain_1" spatial:id="adjacentDomains_1"/>
+ <spatial:adjacentDomains foo="someString" spatial:domain1="domain_1" spatial:domain2="domain_2" spatial:id="adjacentDomains_1"/>
</spatial:listOfAdjacentDomains>
</spatial:geometry>
</model>
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221101-pass-00-01.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221101-pass-00-01.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221101-pass-00-01.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -25,9 +25,14 @@
<spatial:interiorPoint spatial:coord1="0" spatial:coord2="0" spatial:coord3="0"/>
</spatial:listOfInteriorPoints>
</spatial:domain>
+ <spatial:domain spatial:domainType="domainType_1" spatial:id="domain_2">
+ <spatial:listOfInteriorPoints>
+ <spatial:interiorPoint spatial:coord1="0.5" spatial:coord2="0.5" spatial:coord3="0.5"/>
+ </spatial:listOfInteriorPoints>
+ </spatial:domain>
</spatial:listOfDomains>
<spatial:listOfAdjacentDomains>
- <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_1" spatial:id="adjacentDomains_1"/>
+ <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_2" spatial:id="adjacentDomains_1"/>
</spatial:listOfAdjacentDomains>
</spatial:geometry>
</model>
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221101-pass-00-02.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221101-pass-00-02.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221101-pass-00-02.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -25,9 +25,14 @@
<spatial:interiorPoint spatial:coord1="0" spatial:coord2="0" spatial:coord3="0"/>
</spatial:listOfInteriorPoints>
</spatial:domain>
+ <spatial:domain spatial:domainType="domainType_1" spatial:id="domain_2">
+ <spatial:listOfInteriorPoints>
+ <spatial:interiorPoint spatial:coord1="0.5" spatial:coord2="0.5" spatial:coord3="0.5"/>
+ </spatial:listOfInteriorPoints>
+ </spatial:domain>
</spatial:listOfDomains>
<spatial:listOfAdjacentDomains>
- <spatial:adjacentDomains metaid="someString" spatial:domain1="domain_1" spatial:domain2="domain_1" spatial:id="adjacentDomains_1"/>
+ <spatial:adjacentDomains metaid="someString" spatial:domain1="domain_1" spatial:domain2="domain_2" spatial:id="adjacentDomains_1"/>
</spatial:listOfAdjacentDomains>
</spatial:geometry>
</model>
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221101-pass-00-03.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221101-pass-00-03.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221101-pass-00-03.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -25,9 +25,14 @@
<spatial:interiorPoint spatial:coord1="0" spatial:coord2="0" spatial:coord3="0"/>
</spatial:listOfInteriorPoints>
</spatial:domain>
+ <spatial:domain spatial:domainType="domainType_1" spatial:id="domain_2">
+ <spatial:listOfInteriorPoints>
+ <spatial:interiorPoint spatial:coord1="0.5" spatial:coord2="0.5" spatial:coord3="0.5"/>
+ </spatial:listOfInteriorPoints>
+ </spatial:domain>
</spatial:listOfDomains>
<spatial:listOfAdjacentDomains>
- <spatial:adjacentDomains sboTerm="SBO:0000001" spatial:domain1="domain_1" spatial:domain2="domain_1" spatial:id="adjacentDomains_1"/>
+ <spatial:adjacentDomains sboTerm="SBO:0000001" spatial:domain1="domain_1" spatial:domain2="domain_2" spatial:id="adjacentDomains_1"/>
</spatial:listOfAdjacentDomains>
</spatial:geometry>
</model>
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221102-pass-00-01.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221102-pass-00-01.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221102-pass-00-01.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -25,9 +25,14 @@
<spatial:interiorPoint spatial:coord1="0" spatial:coord2="0" spatial:coord3="0"/>
</spatial:listOfInteriorPoints>
</spatial:domain>
+ <spatial:domain spatial:domainType="domainType_1" spatial:id="domain_2">
+ <spatial:listOfInteriorPoints>
+ <spatial:interiorPoint spatial:coord1="0.5" spatial:coord2="0.5" spatial:coord3="0.5"/>
+ </spatial:listOfInteriorPoints>
+ </spatial:domain>
</spatial:listOfDomains>
<spatial:listOfAdjacentDomains>
- <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_1" spatial:id="adjacentDomains_1"/>
+ <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_2" spatial:id="adjacentDomains_1"/>
</spatial:listOfAdjacentDomains>
</spatial:geometry>
</model>
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221102-pass-00-02.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221102-pass-00-02.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221102-pass-00-02.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -25,9 +25,14 @@
<spatial:interiorPoint spatial:coord1="0" spatial:coord2="0" spatial:coord3="0"/>
</spatial:listOfInteriorPoints>
</spatial:domain>
+ <spatial:domain spatial:domainType="domainType_1" spatial:id="domain_2">
+ <spatial:listOfInteriorPoints>
+ <spatial:interiorPoint spatial:coord1="0.5" spatial:coord2="0.5" spatial:coord3="0.5"/>
+ </spatial:listOfInteriorPoints>
+ </spatial:domain>
</spatial:listOfDomains>
<spatial:listOfAdjacentDomains>
- <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_1" spatial:id="adjacentDomains_1">
+ <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_2" spatial:id="adjacentDomains_1">
<annotation/>
</spatial:adjacentDomains>
</spatial:listOfAdjacentDomains>
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221102-pass-00-03.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221102-pass-00-03.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221102-pass-00-03.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -25,9 +25,14 @@
<spatial:interiorPoint spatial:coord1="0" spatial:coord2="0" spatial:coord3="0"/>
</spatial:listOfInteriorPoints>
</spatial:domain>
+ <spatial:domain spatial:domainType="domainType_1" spatial:id="domain_2">
+ <spatial:listOfInteriorPoints>
+ <spatial:interiorPoint spatial:coord1="0.5" spatial:coord2="0.5" spatial:coord3="0.5"/>
+ </spatial:listOfInteriorPoints>
+ </spatial:domain>
</spatial:listOfDomains>
<spatial:listOfAdjacentDomains>
- <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_1" spatial:id="adjacentDomains_1">
+ <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_2" spatial:id="adjacentDomains_1">
<notes/>
</spatial:adjacentDomains>
</spatial:listOfAdjacentDomains>
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221103-fail-01-01.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221103-fail-01-01.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221103-fail-01-01.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -25,9 +25,14 @@
<spatial:interiorPoint spatial:coord1="0" spatial:coord2="0" spatial:coord3="0"/>
</spatial:listOfInteriorPoints>
</spatial:domain>
+ <spatial:domain spatial:domainType="domainType_1" spatial:id="domain_2">
+ <spatial:listOfInteriorPoints>
+ <spatial:interiorPoint spatial:coord1="0.5" spatial:coord2="0.5" spatial:coord3="0.5"/>
+ </spatial:listOfInteriorPoints>
+ </spatial:domain>
</spatial:listOfDomains>
<spatial:listOfAdjacentDomains>
- <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_1" spatial:foo="someString" spatial:id="adjacentDomains_1"/>
+ <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_2" spatial:foo="someString" spatial:id="adjacentDomains_1"/>
</spatial:listOfAdjacentDomains>
</spatial:geometry>
</model>
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221103-fail-01-02.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221103-fail-01-02.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221103-fail-01-02.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -25,9 +25,14 @@
<spatial:interiorPoint spatial:coord1="0" spatial:coord2="0" spatial:coord3="0"/>
</spatial:listOfInteriorPoints>
</spatial:domain>
+ <spatial:domain spatial:domainType="domainType_1" spatial:id="domain_2">
+ <spatial:listOfInteriorPoints>
+ <spatial:interiorPoint spatial:coord1="0.5" spatial:coord2="0.5" spatial:coord3="0.5"/>
+ </spatial:listOfInteriorPoints>
+ </spatial:domain>
</spatial:listOfDomains>
<spatial:listOfAdjacentDomains>
- <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_1"/>
+ <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_2"/>
</spatial:listOfAdjacentDomains>
</spatial:geometry>
</model>
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221103-fail-01-03.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221103-fail-01-03.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221103-fail-01-03.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -25,9 +25,14 @@
<spatial:interiorPoint spatial:coord1="0" spatial:coord2="0" spatial:coord3="0"/>
</spatial:listOfInteriorPoints>
</spatial:domain>
+ <spatial:domain spatial:domainType="domainType_1" spatial:id="domain_2">
+ <spatial:listOfInteriorPoints>
+ <spatial:interiorPoint spatial:coord1="0.5" spatial:coord2="0.5" spatial:coord3="0.5"/>
+ </spatial:listOfInteriorPoints>
+ </spatial:domain>
</spatial:listOfDomains>
<spatial:listOfAdjacentDomains>
- <spatial:adjacentDomains spatial:domain2="domain_1" spatial:id="adjacentDomains_1"/>
+ <spatial:adjacentDomains spatial:domain2="domain_2" spatial:id="adjacentDomains_1"/>
</spatial:listOfAdjacentDomains>
</spatial:geometry>
</model>
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221103-fail-01-04.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221103-fail-01-04.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221103-fail-01-04.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -25,6 +25,11 @@
<spatial:interiorPoint spatial:coord1="0" spatial:coord2="0" spatial:coord3="0"/>
</spatial:listOfInteriorPoints>
</spatial:domain>
+ <spatial:domain spatial:domainType="domainType_1" spatial:id="domain_2">
+ <spatial:listOfInteriorPoints>
+ <spatial:interiorPoint spatial:coord1="0.5" spatial:coord2="0.5" spatial:coord3="0.5"/>
+ </spatial:listOfInteriorPoints>
+ </spatial:domain>
</spatial:listOfDomains>
<spatial:listOfAdjacentDomains>
<spatial:adjacentDomains spatial:domain1="domain_1" spatial:id="adjacentDomains_1"/>
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221103-pass-00-01.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221103-pass-00-01.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221103-pass-00-01.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -25,9 +25,14 @@
<spatial:interiorPoint spatial:coord1="0" spatial:coord2="0" spatial:coord3="0"/>
</spatial:listOfInteriorPoints>
</spatial:domain>
+ <spatial:domain spatial:domainType="domainType_1" spatial:id="domain_2">
+ <spatial:listOfInteriorPoints>
+ <spatial:interiorPoint spatial:coord1="0.5" spatial:coord2="0.5" spatial:coord3="0.5"/>
+ </spatial:listOfInteriorPoints>
+ </spatial:domain>
</spatial:listOfDomains>
<spatial:listOfAdjacentDomains>
- <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_1" spatial:id="adjacentDomains_1"/>
+ <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_2" spatial:id="adjacentDomains_1"/>
</spatial:listOfAdjacentDomains>
</spatial:geometry>
</model>
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221104-fail-01-01.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221104-fail-01-01.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221104-fail-01-01.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -25,9 +25,14 @@
<spatial:interiorPoint spatial:coord1="0" spatial:coord2="0" spatial:coord3="0"/>
</spatial:listOfInteriorPoints>
</spatial:domain>
+ <spatial:domain spatial:domainType="domainType_1" spatial:id="domain_2">
+ <spatial:listOfInteriorPoints>
+ <spatial:interiorPoint spatial:coord1="0.5" spatial:coord2="0.5" spatial:coord3="0.5"/>
+ </spatial:listOfInteriorPoints>
+ </spatial:domain>
</spatial:listOfDomains>
<spatial:listOfAdjacentDomains>
- <spatial:adjacentDomains spatial:domain1="someString" spatial:domain2="domain_1" spatial:id="adjacentDomains_1"/>
+ <spatial:adjacentDomains spatial:domain1="someString" spatial:domain2="domain_2" spatial:id="adjacentDomains_1"/>
</spatial:listOfAdjacentDomains>
</spatial:geometry>
</model>
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221104-pass-00-01.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221104-pass-00-01.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221104-pass-00-01.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -25,9 +25,14 @@
<spatial:interiorPoint spatial:coord1="0" spatial:coord2="0" spatial:coord3="0"/>
</spatial:listOfInteriorPoints>
</spatial:domain>
+ <spatial:domain spatial:domainType="domainType_1" spatial:id="domain_2">
+ <spatial:listOfInteriorPoints>
+ <spatial:interiorPoint spatial:coord1="0.5" spatial:coord2="0.5" spatial:coord3="0.5"/>
+ </spatial:listOfInteriorPoints>
+ </spatial:domain>
</spatial:listOfDomains>
<spatial:listOfAdjacentDomains>
- <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_1" spatial:id="adjacentDomains_1"/>
+ <spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="domain_2" spatial:id="adjacentDomains_1"/>
</spatial:listOfAdjacentDomains>
</spatial:geometry>
</model>
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221105-fail-01-01.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221105-fail-01-01.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221105-fail-01-01.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -25,6 +25,11 @@
<spatial:interiorPoint spatial:coord1="0" spatial:coord2="0" spatial:coord3="0"/>
</spatial:listOfInteriorPoints>
</spatial:domain>
+ <spatial:domain spatial:domainType="domainType_1" spatial:id="domain_2">
+ <spatial:listOfInteriorPoints>
+ <spatial:interiorPoint spatial:coord1="0.5" spatial:coord2="0.5" spatial:coord3="0.5"/>
+ </spatial:listOfInteriorPoints>
+ </spatial:domain>
</spatial:listOfDomains>
<spatial:listOfAdjacentDomains>
<spatial:adjacentDomains spatial:domain1="domain_1" spatial:domain2="someString" spatial:id="adjacentDomains_1"/>
Modified: branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221105-pass-00-01.xml
===================================================================
--- branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221105-pass-00-01.xml 2019-11-20 23:38:03 UTC (rev 26167)
+++ branches/libsbml-experimental/src/sbml/packages/spatial/validator/test/test-data/general-constraints/1221105-pass-00-01.xml 2019-11-21 00:20:51 UTC (rev 26168)
@@ -25,9 +25,14 @@
<spatial:interiorPoint spatial:coord1="0" spatial:coord2="0" spatial:coord3="0"/>
</spatial:listOfInteriorPoints>
</spatial:domain>
+ <spatial:domain spatial:domainType="domainType_1" spatial:id="domain_2">
+ <spatial:listOfInteriorPoints>
+ <spatial:interiorPoint spatial:coord1="0.5" spatia...
[truncated message content] |
