You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(121) |
Aug
(343) |
Sep
(98) |
Oct
(55) |
Nov
(158) |
Dec
(219) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(278) |
Feb
(170) |
Mar
(286) |
Apr
(32) |
May
(83) |
Jun
(140) |
Jul
(212) |
Aug
(242) |
Sep
(52) |
Oct
(29) |
Nov
(132) |
Dec
(259) |
| 2010 |
Jan
(251) |
Feb
(147) |
Mar
(76) |
Apr
(140) |
May
(43) |
Jun
(66) |
Jul
(273) |
Aug
(205) |
Sep
(260) |
Oct
(100) |
Nov
(58) |
Dec
(264) |
| 2011 |
Jan
(219) |
Feb
(344) |
Mar
(320) |
Apr
(334) |
May
(125) |
Jun
(131) |
Jul
(195) |
Aug
(155) |
Sep
(55) |
Oct
(261) |
Nov
(286) |
Dec
(216) |
| 2012 |
Jan
(188) |
Feb
(177) |
Mar
(39) |
Apr
(179) |
May
(148) |
Jun
(43) |
Jul
(229) |
Aug
(104) |
Sep
(76) |
Oct
(82) |
Nov
(93) |
Dec
(180) |
| 2013 |
Jan
(323) |
Feb
(335) |
Mar
(35) |
Apr
(220) |
May
(238) |
Jun
(122) |
Jul
(316) |
Aug
(73) |
Sep
(135) |
Oct
(515) |
Nov
(320) |
Dec
(185) |
| 2014 |
Jan
(81) |
Feb
(146) |
Mar
(337) |
Apr
(234) |
May
(112) |
Jun
(239) |
Jul
(323) |
Aug
(123) |
Sep
(83) |
Oct
(285) |
Nov
(321) |
Dec
(96) |
| 2015 |
Jan
(77) |
Feb
(79) |
Mar
(124) |
Apr
(71) |
May
(35) |
Jun
(45) |
Jul
(77) |
Aug
(44) |
Sep
(22) |
Oct
(84) |
Nov
(120) |
Dec
(37) |
| 2016 |
Jan
(38) |
Feb
(74) |
Mar
(242) |
Apr
(153) |
May
(59) |
Jun
(44) |
Jul
(67) |
Aug
(74) |
Sep
(150) |
Oct
(35) |
Nov
(69) |
Dec
(43) |
| 2017 |
Jan
(43) |
Feb
(9) |
Mar
(274) |
Apr
(40) |
May
(81) |
Jun
(81) |
Jul
(87) |
Aug
(46) |
Sep
(98) |
Oct
(50) |
Nov
(220) |
Dec
(66) |
| 2018 |
Jan
(110) |
Feb
(22) |
Mar
(20) |
Apr
(147) |
May
(148) |
Jun
(30) |
Jul
(83) |
Aug
(63) |
Sep
(40) |
Oct
(53) |
Nov
(51) |
Dec
(104) |
| 2019 |
Jan
(14) |
Feb
(81) |
Mar
(80) |
Apr
(102) |
May
(16) |
Jun
(5) |
Jul
(34) |
Aug
(24) |
Sep
(9) |
Oct
(12) |
Nov
(42) |
Dec
(76) |
| 2020 |
Jan
(15) |
Feb
(11) |
Mar
(12) |
Apr
(7) |
May
(6) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2021 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2022 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(5) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
1
(3) |
2
(6) |
3
(29) |
4
(2) |
5
(4) |
6
(3) |
7
(19) |
|
8
(13) |
9
(14) |
10
(4) |
11
(14) |
12
(12) |
13
(17) |
14
(4) |
|
15
(36) |
16
(15) |
17
(72) |
18
(2) |
19
|
20
|
21
|
|
22
|
23
(3) |
24
(1) |
25
(10) |
26
|
27
(2) |
28
|
|
29
|
30
(1) |
31
|
|
|
|
|
|
From: <sar...@us...> - 2009-03-30 14:36:22
|
Revision: 9431
http://sbml.svn.sourceforge.net/sbml/?rev=9431&view=rev
Author: sarahkeating
Date: 2009-03-30 14:36:09 +0000 (Mon, 30 Mar 2009)
Log Message:
-----------
added functions setId/isSetId/getId and setName/isSetName/getName on SBase.
These hide on casting necessary to use the functions that are now on the derived classes and thus allows the functions to be called from a SBase object.
NOTE: Since an SBase object is never created except as the base of a derived class this shouldnt cause a problem.
Modified Paths:
--------------
branches/libsbml-4/src/sbml/SBase.cpp
branches/libsbml-4/src/sbml/SBase.h
Modified: branches/libsbml-4/src/sbml/SBase.cpp
===================================================================
--- branches/libsbml-4/src/sbml/SBase.cpp 2009-03-27 09:26:47 UTC (rev 9430)
+++ branches/libsbml-4/src/sbml/SBase.cpp 2009-03-30 14:36:09 UTC (rev 9431)
@@ -42,6 +42,10 @@
#include <sbml/ListOf.h>
#include <sbml/SBase.h>
+#ifdef USE_LAYOUT
+ #include <sbml/layout/LineSegment.h>
+#endif
+
/** @cond doxygen-ignored */
using namespace std;
@@ -315,27 +319,249 @@
}
-///*
-// * @return the id of this SBML object.
-// */
-//const string&
-//SBase::getId () const
-//{
-// return mId;
-//}
-//
-//
-///*
-// * @return the name of this SBML object.
-// */
-//const string&
-//SBase::getName () const
-//{
-// return (getLevel() == 1) ? mId : mName;
-//}
-//
-//
+/** @cond doxygen-libsbml-internal */
+
/*
+ * NOTE: THIS IS FOR BACKWARD COMPATABILITY REASONS
+ *
+ * @return the id of this SBML object.
+ */
+const string&
+SBase::getId () const
+{
+ SBMLTypeCode_t type = this->getTypeCode();
+
+ switch(type)
+ {
+ case SBML_COMPARTMENT:
+ return static_cast <const Compartment *> (this)->getId();
+ break;
+
+ case SBML_COMPARTMENT_TYPE:
+ return static_cast <const CompartmentType *> (this)->getId();
+ break;
+
+ case SBML_EVENT:
+ return static_cast <const Event *> (this)->getId();
+ break;
+
+ case SBML_EVENT_ASSIGNMENT:
+ return static_cast <const EventAssignment *> (this)->getVariable();
+ break;
+
+ case SBML_FUNCTION_DEFINITION:
+ return static_cast <const FunctionDefinition *> (this)->getId();
+ break;
+
+ case SBML_INITIAL_ASSIGNMENT:
+ return static_cast <const InitialAssignment *> (this)->getSymbol();
+ break;
+
+ case SBML_MODEL:
+ return static_cast <const Model *> (this)->getId();
+ break;
+
+ case SBML_PARAMETER:
+ return static_cast <const Parameter *> (this)->getId();
+ break;
+
+ case SBML_REACTION:
+ return static_cast <const Reaction *> (this)->getId();
+ break;
+
+ case SBML_SPECIES:
+ return static_cast <const Species *> (this)->getId();
+ break;
+
+ case SBML_SPECIES_REFERENCE:
+ return static_cast <const SpeciesReference *> (this)->getId();
+ break;
+
+ case SBML_SPECIES_TYPE:
+ return static_cast <const SpeciesType *> (this)->getId();
+ break;
+
+ case SBML_MODIFIER_SPECIES_REFERENCE:
+ return static_cast <const ModifierSpeciesReference *> (this)->getId();
+ break;
+
+ case SBML_UNIT_DEFINITION:
+ return static_cast <const UnitDefinition *> (this)->getId();
+ break;
+
+ case SBML_ASSIGNMENT_RULE:
+ return static_cast <const AssignmentRule *> (this)->getVariable();
+ break;
+
+ case SBML_RATE_RULE:
+ return static_cast <const RateRule *> (this)->getVariable();
+ break;
+
+#ifdef USE_LAYOUT
+
+ case SBML_LAYOUT_BOUNDINGBOX:
+ return static_cast <const BoundingBox *> (this)->getId();
+ break;
+
+ case SBML_LAYOUT_GRAPHICALOBJECT:
+ return static_cast <const GraphicalObject *> (this)->getId();
+ break;
+
+ case SBML_LAYOUT_LAYOUT:
+ return static_cast <const Layout *> (this)->getId();
+ break;
+
+ case SBML_LAYOUT_LINESEGMENT:
+ return static_cast <const LineSegment *> (this)->getId();
+ break;
+#endif /* USE_LAYOUT */
+
+ default:
+ return "";
+ break;
+ }
+
+ return "";
+}
+
+
+
+/*
+ * NOTE: THIS IS FOR BACKWARD COMPATABILITY REASONS
+ *
+ * @return the name of this SBML object.
+ */
+const string&
+SBase::getName () const
+{
+ SBMLTypeCode_t type = this->getTypeCode();
+
+ if (getLevel() == 1)
+ {
+ switch(type)
+ {
+ case SBML_COMPARTMENT:
+ return static_cast <const Compartment *> (this)->getId();
+ break;
+
+ case SBML_MODEL:
+ return static_cast <const Model *> (this)->getId();
+ break;
+
+ case SBML_PARAMETER:
+ return static_cast <const Parameter *> (this)->getId();
+ break;
+
+ case SBML_REACTION:
+ return static_cast <const Reaction *> (this)->getId();
+ break;
+
+ case SBML_SPECIES:
+ return static_cast <const Species *> (this)->getId();
+ break;
+
+ case SBML_UNIT_DEFINITION:
+ return static_cast <const UnitDefinition *> (this)->getId();
+ break;
+
+ case SBML_ASSIGNMENT_RULE:
+ return static_cast <const AssignmentRule *> (this)->getVariable();
+ break;
+
+ case SBML_RATE_RULE:
+ return static_cast <const RateRule *> (this)->getVariable();
+ break;
+
+ #ifdef USE_LAYOUT
+
+ case SBML_LAYOUT_BOUNDINGBOX:
+ return static_cast <const BoundingBox *> (this)->getId();
+ break;
+
+ case SBML_LAYOUT_GRAPHICALOBJECT:
+ return static_cast <const GraphicalObject *> (this)->getId();
+ break;
+
+ case SBML_LAYOUT_LAYOUT:
+ return static_cast <const Layout *> (this)->getId();
+ break;
+
+ case SBML_LAYOUT_LINESEGMENT:
+ return static_cast <const LineSegment *> (this)->getId();
+ break;
+ #endif /* USE_LAYOUT */
+
+ default:
+ return "";
+ break;
+ }
+
+ return "";
+ }
+ else
+ {
+ switch(type)
+ {
+ case SBML_COMPARTMENT:
+ return static_cast <const Compartment *> (this)->getName();
+ break;
+
+ case SBML_COMPARTMENT_TYPE:
+ return static_cast <const CompartmentType *> (this)->getName();
+ break;
+
+ case SBML_EVENT:
+ return static_cast <const Event *> (this)->getName();
+ break;
+
+ case SBML_FUNCTION_DEFINITION:
+ return static_cast <const FunctionDefinition *> (this)->getName();
+ break;
+
+ case SBML_MODEL:
+ return static_cast <const Model *> (this)->getName();
+ break;
+
+ case SBML_PARAMETER:
+ return static_cast <const Parameter *> (this)->getName();
+ break;
+
+ case SBML_REACTION:
+ return static_cast <const Reaction *> (this)->getName();
+ break;
+
+ case SBML_SPECIES:
+ return static_cast <const Species *> (this)->getName();
+ break;
+
+ case SBML_SPECIES_REFERENCE:
+ return static_cast <const SpeciesReference *> (this)->getName();
+ break;
+
+ case SBML_SPECIES_TYPE:
+ return static_cast <const SpeciesType *> (this)->getName();
+ break;
+
+ case SBML_MODIFIER_SPECIES_REFERENCE:
+ return static_cast <const ModifierSpeciesReference *> (this)->getName();
+ break;
+
+ case SBML_UNIT_DEFINITION:
+ return static_cast <const UnitDefinition *> (this)->getName();
+ break;
+
+ default:
+ return "";
+ break;
+ }
+
+ return "";
+ }
+}
+
+/** @endcond doxygen-libsbml-internal */
+
+/*
* @return the notes of this SBML object.
*/
XMLNode*
@@ -527,30 +753,38 @@
}
-///*
-// * @return true if the id of this SBML object has been set, false
-// * otherwise.
-// */
-//bool
-//SBase::isSetId () const
-//{
-// return (mId.empty() == false);
-//}
-//
-//
-///*
-// * @return true if the name of this SBML object has been set, false
-// * otherwise.
-// */
-//bool
-//SBase::isSetName () const
-//{
-// return (getLevel() == 1) ? (mId.empty() == false) :
-// (mName.empty() == false);
-//}
-//
-//
+/** @cond doxygen-libsbml-internal */
+
/*
+ * NOTE: THIS IS FOR BACKWARD COMPATABILITY REASONS
+ *
+ * @return true if the id of this SBML object has been set, false
+ * otherwise.
+ */
+bool
+SBase::isSetId () const
+{
+ return (getId().empty() == false);
+}
+
+
+/*
+ * NOTE: THIS IS FOR BACKWARD COMPATABILITY REASONS
+ *
+ * @return true if the name of this SBML object has been set, false
+ * otherwise.
+ */
+bool
+SBase::isSetName () const
+{
+ return (getName().empty() == false);
+}
+
+
+/** @endcond doxygen-libsbml-internal */
+
+
+/*
* @return true if the notes of this SBML object has been set, false
* otherwise.
*/
@@ -611,63 +845,265 @@
}
-///*
-// * Sets the id of this SBML object to a copy of sid.
-// */
-//int
-//SBase::setId (const std::string& sid)
-//{
-// /* since the setId function has been used as an
-// * alias for setName we cant require it to only
-// * be used on a L2 model
-// */
-///* if (getLevel() == 1)
-// {
-// return LIBSBML_UNEXPECTED_ATTRIBUTE;
-// }
-//*/
-// if (!(SBase::hasCorrectSBMLSIdSyntax(sid)))
-// {
-// return LIBSBML_INVALID_ATTRIBUTE_VALUE;
-// }
-// else
-// {
-// mId = sid;
-// return LIBSBML_OPERATION_SUCCESS;
-// }
-//}
-//
-//
-///*
-// * Sets the name of this SBML object to a copy of name.
-// */
-//int
-//SBase::setName (const std::string& name)
-//{
-// /* if this is setting an L2 name the type is string
-// * whereas if it is setting an L1 name its type is SId
-// */
-// if (getLevel() == 1)
-// {
-// if (!(SBase::hasCorrectSBMLSIdSyntax(name)))
-// {
-// return LIBSBML_INVALID_ATTRIBUTE_VALUE;
-// }
-// else
-// {
-// mId = name;
-// return LIBSBML_OPERATION_SUCCESS;
-// }
-// }
-// else
-// {
-// mName = name;
-// return LIBSBML_OPERATION_SUCCESS;
-// }
-//}
-//
-//
+/** @cond doxygen-libsbml-internal */
+
/*
+ * NOTE: THIS IS FOR BACKWARD COMPATABILITY REASONS
+ *
+ * Sets the id of this SBML object to a copy of sid.
+ */
+int
+SBase::setId (const std::string& sid)
+{
+ SBMLTypeCode_t type = this->getTypeCode();
+
+ switch(type)
+ {
+ case SBML_COMPARTMENT:
+ return static_cast <Compartment *> (this)->setId(sid);
+ break;
+
+ case SBML_COMPARTMENT_TYPE:
+ return static_cast <CompartmentType *> (this)->setId(sid);
+ break;
+
+ case SBML_EVENT:
+ return static_cast <Event *> (this)->setId(sid);
+ break;
+
+ case SBML_EVENT_ASSIGNMENT:
+ return static_cast <EventAssignment *> (this)->setVariable(sid);
+ break;
+
+ case SBML_FUNCTION_DEFINITION:
+ return static_cast <FunctionDefinition *> (this)->setId(sid);
+ break;
+
+ case SBML_INITIAL_ASSIGNMENT:
+ return static_cast <InitialAssignment *> (this)->setSymbol(sid);
+ break;
+
+ case SBML_MODEL:
+ return static_cast <Model *> (this)->setId(sid);
+ break;
+
+ case SBML_PARAMETER:
+ return static_cast <Parameter *> (this)->setId(sid);
+ break;
+
+ case SBML_REACTION:
+ return static_cast <Reaction *> (this)->setId(sid);
+ break;
+
+ case SBML_SPECIES:
+ return static_cast <Species *> (this)->setId(sid);
+ break;
+
+ case SBML_SPECIES_REFERENCE:
+ return static_cast <SpeciesReference *> (this)->setId(sid);
+ break;
+
+ case SBML_SPECIES_TYPE:
+ return static_cast <SpeciesType *> (this)->setId(sid);
+ break;
+
+ case SBML_MODIFIER_SPECIES_REFERENCE:
+ return static_cast <ModifierSpeciesReference *> (this)->setId(sid);
+ break;
+
+ case SBML_UNIT_DEFINITION:
+ return static_cast <UnitDefinition *> (this)->setId(sid);
+ break;
+
+ case SBML_ASSIGNMENT_RULE:
+ return static_cast <AssignmentRule *> (this)->setVariable(sid);
+ break;
+
+ case SBML_RATE_RULE:
+ return static_cast <RateRule *> (this)->setVariable(sid);
+ break;
+
+#ifdef USE_LAYOUT
+
+ case SBML_LAYOUT_BOUNDINGBOX:
+ static_cast <BoundingBox *> (this)->setId(sid);
+ return LIBSBML_OPERATION_SUCCESS;
+ break;
+
+ case SBML_LAYOUT_GRAPHICALOBJECT:
+ static_cast <GraphicalObject *> (this)->setId(sid);
+ return LIBSBML_OPERATION_SUCCESS;
+ break;
+
+ case SBML_LAYOUT_LAYOUT:
+ static_cast <Layout *> (this)->setId(sid);
+ return LIBSBML_OPERATION_SUCCESS;
+ break;
+
+ case SBML_LAYOUT_LINESEGMENT:
+ static_cast <LineSegment *> (this)->setId(sid);
+ return LIBSBML_OPERATION_SUCCESS;
+ break;
+#endif /* USE_LAYOUT */
+
+ default:
+ return LIBSBML_UNEXPECTED_ATTRIBUTE;
+ break;
+ }
+}
+
+
+/*
+ * NOTE: THIS IS FOR BACKWARD COMPATABILITY REASONS
+ * Sets the name of this SBML object to a copy of name.
+ */
+int
+SBase::setName (const std::string& name)
+{
+ SBMLTypeCode_t type = this->getTypeCode();
+
+ /* if this is setting an L2 name the type is string
+ * whereas if it is setting an L1 name its type is SId
+ */
+ if (getLevel() == 1)
+ {
+ if (!(SBase::hasCorrectSBMLSIdSyntax(name)))
+ {
+ return LIBSBML_INVALID_ATTRIBUTE_VALUE;
+ }
+ else
+ {
+ switch(type)
+ {
+ case SBML_COMPARTMENT:
+ return static_cast <Compartment *> (this)->setId(name);
+ break;
+
+ case SBML_MODEL:
+ return static_cast <Model *> (this)->setId(name);
+ break;
+
+ case SBML_PARAMETER:
+ return static_cast <Parameter *> (this)->setId(name);
+ break;
+
+ case SBML_REACTION:
+ return static_cast <Reaction *> (this)->setId(name);
+ break;
+
+ case SBML_SPECIES:
+ return static_cast <Species *> (this)->setId(name);
+ break;
+
+ case SBML_SPECIES_REFERENCE:
+ return static_cast <SpeciesReference *> (this)->setId(name);
+ break;
+
+ case SBML_UNIT_DEFINITION:
+ return static_cast <UnitDefinition *> (this)->setId(name);
+ break;
+
+ case SBML_ASSIGNMENT_RULE:
+ return static_cast <AssignmentRule *> (this)->setVariable(name);
+ break;
+
+ case SBML_RATE_RULE:
+ return static_cast <RateRule *> (this)->setVariable(name);
+ break;
+
+ #ifdef USE_LAYOUT
+
+ case SBML_LAYOUT_BOUNDINGBOX:
+ static_cast <BoundingBox *> (this)->setId(name);
+ return LIBSBML_OPERATION_SUCCESS;
+ break;
+
+ case SBML_LAYOUT_GRAPHICALOBJECT:
+ static_cast <GraphicalObject *> (this)->setId(name);
+ return LIBSBML_OPERATION_SUCCESS;
+ break;
+
+ case SBML_LAYOUT_LAYOUT:
+ static_cast <Layout *> (this)->setId(name);
+ return LIBSBML_OPERATION_SUCCESS;
+ break;
+
+ case SBML_LAYOUT_LINESEGMENT:
+ static_cast <LineSegment *> (this)->setId(name);
+ return LIBSBML_OPERATION_SUCCESS;
+ break;
+ #endif /* USE_LAYOUT */
+
+ default:
+ return LIBSBML_UNEXPECTED_ATTRIBUTE;
+ break;
+ }
+ }
+ }
+ else
+ {
+ switch(type)
+ {
+ case SBML_COMPARTMENT:
+ return static_cast <Compartment *> (this)->setName(name);
+ break;
+
+ case SBML_COMPARTMENT_TYPE:
+ return static_cast <CompartmentType *> (this)->setName(name);
+ break;
+
+ case SBML_EVENT:
+ return static_cast <Event *> (this)->setName(name);
+ break;
+
+ case SBML_FUNCTION_DEFINITION:
+ return static_cast <FunctionDefinition *> (this)->setName(name);
+ break;
+
+ case SBML_MODEL:
+ return static_cast <Model *> (this)->setName(name);
+ break;
+
+ case SBML_PARAMETER:
+ return static_cast <Parameter *> (this)->setName(name);
+ break;
+
+ case SBML_REACTION:
+ return static_cast <Reaction *> (this)->setName(name);
+ break;
+
+ case SBML_SPECIES:
+ return static_cast <Species *> (this)->setName(name);
+ break;
+
+ case SBML_SPECIES_REFERENCE:
+ return static_cast <SpeciesReference *> (this)->setName(name);
+ break;
+
+ case SBML_SPECIES_TYPE:
+ return static_cast <SpeciesType *> (this)->setName(name);
+ break;
+
+ case SBML_MODIFIER_SPECIES_REFERENCE:
+ return static_cast <ModifierSpeciesReference *> (this)->setName(name);
+ break;
+
+ case SBML_UNIT_DEFINITION:
+ return static_cast <UnitDefinition *> (this)->setName(name);
+ break;
+
+ default:
+ return LIBSBML_UNEXPECTED_ATTRIBUTE;
+ break;
+ }
+ }
+}
+
+
+/** @endcond doxygen-libsbml-internal */
+
+
+/*
* Sets the annotation of this SBML object to a copy of annotation.
*/
int
Modified: branches/libsbml-4/src/sbml/SBase.h
===================================================================
--- branches/libsbml-4/src/sbml/SBase.h 2009-03-27 09:26:47 UTC (rev 9430)
+++ branches/libsbml-4/src/sbml/SBase.h 2009-03-30 14:36:09 UTC (rev 9431)
@@ -428,22 +428,29 @@
std::string& getMetaId ();
- ///**
- // * Returns the value of the "id" attribute of this object.
- // *
- // * @return the id of this SBML object.
- // */
- //const std::string& getId () const;
+ /** @cond doxygen-libsbml-internal */
+ /*
+ * NOTE: THIS IS FOR BACKWARD COMPATABILITY REASONS
+ *
+ * Returns the value of the "id" attribute of this object.
+ *
+ * @return the id of this SBML object.
+ */
+ const std::string& getId () const;
- ///**
- // * Returns the value of the "name" attribute of this object.
- // *
- // * @return the name of this SBML object.
- // */
- //const std::string& getName () const;
+ /*
+ * NOTE: THIS IS FOR BACKWARD COMPATABILITY REASONS
+ *
+ * Returns the value of the "name" attribute of this object.
+ *
+ * @return the name of this SBML object.
+ */
+ const std::string& getName () const;
+ /** @endcond doxygen-libsbml-internal */
+
/**
* Returns the content of the "notes" subelement of this object.
*
@@ -632,30 +639,38 @@
bool isSetMetaId () const;
- ///**
- // * Predicate returning @c true or @c false depending on whether this
- // * object's "id" attribute has been set.
- // *
- // * @htmlinclude libsbml-comment-set-methods.html
- // *
- // * @return @c true if the "id" attribute of this SBML object has been
- // * set, @c false otherwise.
- // */
- //bool isSetId () const;
+ /** @cond doxygen-libsbml-internal */
+ /*
+ * NOTE: THIS IS FOR BACKWARD COMPATABILITY REASONS
+ * Predicate returning @c true or @c false depending on whether this
+ * object's "id" attribute has been set.
+ *
+ * @htmlinclude libsbml-comment-set-methods.html
+ *
+ * @return @c true if the "id" attribute of this SBML object has been
+ * set, @c false otherwise.
+ */
+ bool isSetId () const;
- ///**
- // * Predicate returning @c true or @c false depending on whether this
- // * object's "name" attribute has been set.
- // *
- // * @htmlinclude libsbml-comment-set-methods.html
- // *
- // * @return @c true if the "name" attribute of this SBML object has been
- // * set, @c false otherwise.
- // */
- //bool isSetName () const;
+ /*
+ * NOTE: THIS IS FOR BACKWARD COMPATABILITY REASONS
+ * Predicate returning @c true or @c false depending on whether this
+ * object's "name" attribute has been set.
+ *
+ * @htmlinclude libsbml-comment-set-methods.html
+ *
+ * @return @c true if the "name" attribute of this SBML object has been
+ * set, @c false otherwise.
+ */
+ bool isSetName () const;
+
+
+ /** @endcond doxygen-libsbml-internal */
+
+
/**
* Predicate returning @c true or @c false depending on whether this
* object's "notes" subelement exists and has content.
@@ -719,61 +734,67 @@
*/
int setMetaId (const std::string& metaid);
+ /** @cond doxygen-libsbml-internal */
- ///**
- // * Sets the value of the "id" attribute of this SBML object.
- // *
- // * The string @p sid is copied. Note that SBML has strict requirements
- // * for the syntax of identifiers. The following is summary of the
- // * definition of the SBML identifier type @c SId (here expressed in an
- // * extended form of BNF notation):
- // * @code
- // * letter ::= 'a'..'z','A'..'Z'
- // * digit ::= '0'..'9'
- // * idChar ::= letter | digit | '_'
- // * SId ::= ( letter | '_' ) idChar*
- // * @endcode
- // * The equality of SBML identifiers is determined by an exact character
- // * sequence match; i.e., comparisons must be performed in a
- // * case-sensitive manner. In addition, there are a few conditions for
- // * the uniqueness of identifiers in an SBML model. Please consult the
- // * SBML specifications for the exact formulations.
- // *
- // * @htmlinclude libsbml-comment-set-methods.html
- // *
- // * @param sid the string to use as the identifier of this object
- // *
- // * @return integer value indicating success/failure of the
- // * function. The value is drawn from the
- // * enumeration operationReturnValues_t. The possible values
- // * returned by this function are:
- // *
- // * LIBSBML_OPERATION_SUCCESS<br>
- // * LIBSBML_INVALID_ATTRIBUTE_VALUE<br>
- // */
- //virtual int setId (const std::string& sid);
+ /*
+ * NOTE: THIS IS FOR BACKWARD COMPATABILITY REASONS
+ *
+ * Sets the value of the "id" attribute of this SBML object.
+ *
+ * The string @p sid is copied. Note that SBML has strict requirements
+ * for the syntax of identifiers. The following is summary of the
+ * definition of the SBML identifier type @c SId (here expressed in an
+ * extended form of BNF notation):
+ * @code
+ * letter ::= 'a'..'z','A'..'Z'
+ * digit ::= '0'..'9'
+ * idChar ::= letter | digit | '_'
+ * SId ::= ( letter | '_' ) idChar*
+ * @endcode
+ * The equality of SBML identifiers is determined by an exact character
+ * sequence match; i.e., comparisons must be performed in a
+ * case-sensitive manner. In addition, there are a few conditions for
+ * the uniqueness of identifiers in an SBML model. Please consult the
+ * SBML specifications for the exact formulations.
+ *
+ * @htmlinclude libsbml-comment-set-methods.html
+ *
+ * @param sid the string to use as the identifier of this object
+ *
+ * @return integer value indicating success/failure of the
+ * function. The value is drawn from the
+ * enumeration operationReturnValues_t. The possible values
+ * returned by this function are:
+ *
+ * LIBSBML_OPERATION_SUCCESS<br>
+ * LIBSBML_INVALID_ATTRIBUTE_VALUE<br>
+ */
+ int setId (const std::string& sid);
- ///**
- // * Sets the value of the "name" attribute of this SBML object.
- // *
- // * The string in @p name is copied.
- // *
- // * @htmlinclude libsbml-comment-set-methods.html
- // *
- // * @param name the new name for the object
- // *
- // * @return integer value indicating success/failure of the
- // * function. The value is drawn from the
- // * enumeration operationReturnValues_t. The possible values
- // * returned by this function are:
- // *
- // * LIBSBML_OPERATION_SUCCESS<br>
- // * LIBSBML_INVALID_ATTRIBUTE_VALUE<br>
- // */
- //virtual int setName (const std::string& name);
+ /*
+ * NOTE: THIS IS FOR BACKWARD COMPATABILITY REASONS
+ * Sets the value of the "name" attribute of this SBML object.
+ *
+ * The string in @p name is copied.
+ *
+ * @htmlinclude libsbml-comment-set-methods.html
+ *
+ * @param name the new name for the object
+ *
+ * @return integer value indicating success/failure of the
+ * function. The value is drawn from the
+ * enumeration operationReturnValues_t. The possible values
+ * returned by this function are:
+ *
+ * LIBSBML_OPERATION_SUCCESS<br>
+ * LIBSBML_INVALID_ATTRIBUTE_VALUE<br>
+ */
+ int setName (const std::string& name);
+ /** @endcond doxygen-libsbml-internal */
+
/**
* Sets the value of the "annotation" subelement of this SBML object to a
* copy of @p annotation.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fbe...@us...> - 2009-03-27 09:26:53
|
Revision: 9430
http://sbml.svn.sourceforge.net/sbml/?rev=9430&view=rev
Author: fbergmann
Date: 2009-03-27 09:26:47 +0000 (Fri, 27 Mar 2009)
Log Message:
-----------
-fixed some typos in the TeX files
Modified Paths:
--------------
trunk/specifications/sbml-level-3/version-1/core/spec/annotations.tex
trunk/specifications/sbml-level-3/version-1/core/spec/preliminary.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20406.tex
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/annotations.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/annotations.tex 2009-03-27 09:00:59 UTC (rev 9429)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/annotations.tex 2009-03-27 09:26:47 UTC (rev 9430)
@@ -224,8 +224,8 @@
The value of the \token{rdf:resource} attribute is a URI, not a
URL; as such, a URI does not have to reference a physical web
object but simply identifies a controlled vocabulary term or
-database object (a URI is} a label). For instance, a true URL for an Internet
-resource such as \uri{http://www.uniprot.org/entry/P12999}} might
+database object (a URI is a label). For instance, a true URL for an Internet
+resource such as \uri{http://www.uniprot.org/entry/P12999} might
correspond to the URI \uri{urn:miriam:uniprot:P12999}.
SBML does not specify how a parser is to interpret a URI. In the
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/preliminary.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/preliminary.tex 2009-03-27 09:00:59 UTC (rev 9429)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/preliminary.tex 2009-03-27 09:26:47 UTC (rev 9430)
@@ -1731,7 +1731,7 @@
The consistency of units is defined in terms of
dimensional analysis applied recursively to every operator and
function and every argument to them. The following
-conditions should hold true in a model (and software}
+conditions should hold true in a model (and software)
developers may wish to consider having their software warn users
if one or more of the following conditions is not true:
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20406.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20406.tex 2009-03-27 09:00:59 UTC (rev 9429)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20406.tex 2009-03-27 09:26:47 UTC (rev 9430)
@@ -6,6 +6,6 @@
\val{3}; (b) the \token{kind} attribute has a value of
\val{litre} and the \token{exponent} attribute has a value of \val{1}; or
(c) the kind attribute has a value of \val{dimensionless} with
-any \token{exponent} value. (References: L2V1 Section 4.4.3; L2V2}
+any \token{exponent} value. (References: L2V1 Section 4.4.3; L2V2)
Section~4.4.3; L2V3 Section~4.4.3; L2V4
Section~\ref{sec:predefined-units}.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mh...@us...> - 2009-03-27 09:01:06
|
Revision: 9429
http://sbml.svn.sourceforge.net/sbml/?rev=9429&view=rev
Author: mhucka
Date: 2009-03-27 09:00:59 +0000 (Fri, 27 Mar 2009)
Log Message:
-----------
Removed change markers from previous spec version.
Modified Paths:
--------------
trunk/specifications/sbml-level-3/version-1/core/spec/acknowledgments.tex
trunk/specifications/sbml-level-3/version-1/core/spec/annotations.tex
trunk/specifications/sbml-level-3/version-1/core/spec/apdx-changes.tex
trunk/specifications/sbml-level-3/version-1/core/spec/apdx-fast.tex
trunk/specifications/sbml-level-3/version-1/core/spec/apdx-mathml-schema.tex
trunk/specifications/sbml-level-3/version-1/core/spec/apdx-overdetermined.tex
trunk/specifications/sbml-level-3/version-1/core/spec/apdx-processing-notes.tex
trunk/specifications/sbml-level-3/version-1/core/spec/apdx-release-history.tex
trunk/specifications/sbml-level-3/version-1/core/spec/apdx-schema.tex
trunk/specifications/sbml-level-3/version-1/core/spec/apdx-validation.tex
trunk/specifications/sbml-level-3/version-1/core/spec/components.tex
trunk/specifications/sbml-level-3/version-1/core/spec/discussion.tex
trunk/specifications/sbml-level-3/version-1/core/spec/examples/algebraicrules.xml
trunk/specifications/sbml-level-3/version-1/core/spec/examples/assignmentrules.xml
trunk/specifications/sbml-level-3/version-1/core/spec/examples/boundarycondition.xml
trunk/specifications/sbml-level-3/version-1/core/spec/examples/delay.xml
trunk/specifications/sbml-level-3/version-1/core/spec/examples/dimerization.xml
trunk/specifications/sbml-level-3/version-1/core/spec/examples/enzymekinetics.xml
trunk/specifications/sbml-level-3/version-1/core/spec/examples/events.xml
trunk/specifications/sbml-level-3/version-1/core/spec/examples/functiondef.xml
trunk/specifications/sbml-level-3/version-1/core/spec/examples.tex
trunk/specifications/sbml-level-3/version-1/core/spec/intro.tex
trunk/specifications/sbml-level-3/version-1/core/spec/overview.tex
trunk/specifications/sbml-level-3/version-1/core/spec/preliminary.tex
trunk/specifications/sbml-level-3/version-1/core/spec/sbml-level-3-version-1-core.tex
trunk/specifications/sbml-level-3/version-1/core/spec/sbo.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10211.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10212.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10403.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10501.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10511.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10512.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10513.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10521.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10522.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10523.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10531.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10532.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10533.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10541.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10551.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10561.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10562.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10563.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10701.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10702.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10703.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10704.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10705.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10706.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10707.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10708.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10709.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10710.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10711.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10712.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10713.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10714.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10715.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10716.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10717.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20402.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20403.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20404.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20405.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20406.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20407.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20408.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20410.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20701.tex
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/acknowledgments.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/acknowledgments.tex 2009-03-25 23:33:35 UTC (rev 9428)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/acknowledgments.tex 2009-03-27 09:00:59 UTC (rev 9429)
@@ -1,4 +1,4 @@
-% -*- TeX-master: "sbml-level-2-version-4"; fill-column: 66 -*-
+% -*- TeX-master: "sbml-level-3-version-1-core"; fill-column: 66 -*-
% $Id$
% $HeadURL$
% ----------------------------------------------------------------
@@ -7,8 +7,6 @@
\label{sec:acknowledgements}
\label{sec:acknowledgments}
-\begin{blockChanged}
-
The development of SBML was originally funded entirely by the
Japan Science and Technology Agency (JST) under the ERATO Kitano
Symbiotic Systems Project during the years 2000--2003. From 2003
@@ -35,8 +33,6 @@
Newcastle (UK), the Systems Biology Institute (Japan), and the
Virginia Bioinformatics Institute (USA).
-\end{blockChanged}
-
SBML was first conceived at the JST/ERATO-sponsored \emph{First
Workshop on Software Platforms for Systems Biology}, held in
April, 2000, at the California Institute of Technology in
@@ -53,8 +49,6 @@
meetings, we produced a specification for SBML
Level~1~\citep{hucka:2001}.
-\begin{blockChanged}
-
\sbmltwo was conceived at the \emph{5th Workshop on Software
Platforms for Systems Biology}, held in July 2002, at the
University of Hertfordshire, UK. The participants collectively
@@ -85,5 +79,3 @@
A guide to software known to support SBML is provided on the
SBML.org website at the following URL:
\link{http://sbml.org/SBML\_Software\_Guide}{http://sbml.org/SBML\_Software\_Guide}.
-
-\end{blockChanged}
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/annotations.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/annotations.tex 2009-03-25 23:33:35 UTC (rev 9428)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/annotations.tex 2009-03-27 09:00:59 UTC (rev 9429)
@@ -1,4 +1,4 @@
-% -*- TeX-master: "sbml-level-2-version-4"; fill-column: 66 -*-
+% -*- TeX-master: "sbml-level-3-version-1-core"; fill-column: 66 -*-
% $Id$
% $HeadURL$
% ----------------------------------------------------------------
@@ -39,8 +39,6 @@
\token{sboTerm}; however, this scheme is significantly more
flexible.
-\begin{blockChanged}
-
It is generally not recommended that this format be used to refer
to SBO terms. In most cases, the SBO terms should be referred to
using the attribute \token{sboTerm} part of \token{SBase}
@@ -49,8 +47,6 @@
species, it is necessary to add this additional information using the
annotation format described here.
-\end{blockChanged}
-
\subsection{XML namespaces in the standard annotation}
This format uses a restricted form of Dublin
@@ -169,9 +165,6 @@
value. (As this attribute is of the type \primtype{ID} its value
must unique to the entire SBML document.)
-
-\begin{blockChanged}
-
The first element of the \token{rdf:RDF} element must be an
\token{rdf:Description} element with an \token{rdf:about}
attribute. The value of the
@@ -181,8 +174,6 @@
This format doesn't define the form of subsequent
subelements of the \token{rdf:RDF} element. In particular, the unique \token{rdf:RDF} element contained in the annotation can contain other \token{rdf:Description}, which content can be any valid RDF.
-\end{blockChanged}
-
The \token{rdf:Description} element can contain only an optional
model history section (see
Section~\ref{sec:model-history-annotation}) followed by a sequence
@@ -217,7 +208,7 @@
For example, a \Species element representing a protein could be
annotated with a reference to the database UniProt by the
-\changed{\uri{urn:miriam:uniprot:P12999}} resource identifier,
+\uri{urn:miriam:uniprot:P12999} resource identifier,
identifying exactly the protein described by the \Species element.
This identifier maps to a unique entry in UniProt which is never
deleted from the database. In the case of UniProt, this is the
@@ -230,28 +221,25 @@
The value of a \token{rdf:resource} attribute is a URI that both
uniquely identifies the resource, and the data in the resource.
-\changed{The value of the \token{rdf:resource} attribute is a URI, not a
-URL; as such, a URI does not have to} \changed{reference a physical web
+The value of the \token{rdf:resource} attribute is a URI, not a
+URL; as such, a URI does not have to reference a physical web
object but simply identifies a controlled vocabulary term or
-database object (a URI is} \changed{a label). For instance, a true URL for an Internet
-resource such as \uri{http://www.uniprot.org/entry/P12999}} \changed{might
-correspond to the URI \uri{urn:miriam:uniprot:P12999}}.
+database object (a URI is} a label). For instance, a true URL for an Internet
+resource such as \uri{http://www.uniprot.org/entry/P12999}} might
+correspond to the URI \uri{urn:miriam:uniprot:P12999}.
-\begin{blockChanged}
-
SBML does not specify how a parser is to interpret a URI. In the
case of a transformation into a physical URL, there could be
several solutions. For example, the URI
-\changed{\uri{urn:miriam:obo.go:GO\%3A0007268}} can be translated
+\uri{urn:miriam:obo.go:GO\%3A0007268} can be translated
into:
-\end{blockChanged}
\noindent \uri{http://www.ebi.ac.uk/ego/DisplayGoTerm?selected=GO:0007268}\\
\noindent \uri{http://www.godatabase.org/cgi-bin/amigo/go.cgi?view=details\&query=GO:0007268}\\
\noindent \uri{http://www.informatics.jax.org/searches/GO.cgi?id=GO:0007268}
-Similarly the URI \changed{\uri{urn:miriam:ec-code:3.5.4.4}} can refer to:
+Similarly the URI \uri{urn:miriam:ec-code:3.5.4.4} can refer to:
\noindent \uri{http://www.ebi.ac.uk/intenz/query?cmd=SearchEC\&ec=3.5.4.4}\\
\noindent \uri{http://www.expasy.org/cgi-bin/nicezyme.pl?3.5.4.4}\\
@@ -263,21 +251,21 @@
set of standardized valid URI syntax rules which may be used
within the standard annotation format. This set of rules is not
part of the SBML standard but will grow independently from
-specific SBML Levels and Versions. As the set changes\changed{,} a given URI
-syntax rule will not be modified\changed{,} although the physical resources
+specific SBML Levels and Versions. As the set changes, a given URI
+syntax rule will not be modified, although the physical resources
associated with the rule may change. These URIs will always be
-composed as \changed{\token{resource:id}}. The MIRIAM Resources \changed{facility located at}
+composed as \token{resource:id}. The MIRIAM Resources facility located at
\url{http://www.ebi.ac.uk/compneur-srv/miriam-main/} lists URI syntaxes and
-possible physical links to controlled \changed{vocabularies} and databases.
+possible physical links to controlled vocabularies and databases.
Each entry contains a list of SBML and relation elements in which
the given URI can be appropriately embedded. To enable consistent
and thus useful links to external resources, the URI syntax rule
set must have a consistent view of the concepts represented by the
-different SBML elements for the purposes of this format. \changed{For
-example, as the rule set is designed to link SBML biological and}
-\changed{biochemical resources the rule set assumes that a \Species element
-represents the concept of a biochemical} \changed{entity type rather than
-mathematical symbol}. The URI rule list will evolve with the
+different SBML elements for the purposes of this format. For
+example, as the rule set is designed to link SBML biological and
+biochemical resources the rule set assumes that a \Species element
+represents the concept of a biochemical entity type rather than
+mathematical symbol. The URI rule list will evolve with the
evolution of databases and resources. The annotation format
described in this section does not require a simple parser of this
format to access this list.
@@ -310,9 +298,9 @@
represented by the species. (The species is not made up of all the
entities represented by all the references combined).
-The complete list of the qualifier elements in the Bio\changed{M}odels
+The complete list of the qualifier elements in the BioModels
qualifier namespaces is documented at
-\changed{\url{http://www.ebi.ac.uk/compneur-srv/miriam-main/mdb?section=qualifiers}}. The list is
+\url{http://www.ebi.ac.uk/compneur-srv/miriam-main/mdb?section=qualifiers}. The list is
divided into two namespaces one for model qualifiers
\uri{http://biomodels.net/biology-qualifiers/} (prefix used here
\token{bqbiol}) and the other for biological qualifiers
@@ -383,7 +371,6 @@
species or a parameter to the literature that describes the
quantity of the species or the value of the parameter.
-\begin{blockChanged}
\item \token{bqbiol:isEncodedBy} The biological entity represented
by the model component is encoded, either directly or by virtue
@@ -395,7 +382,6 @@
\item \token{bqbiol:occursIn} The biological entity represented by the model component takes place in the subject of the reference resource.
-\end{blockChanged}
\end{itemize}
@@ -421,7 +407,6 @@
dates recording changes to the model. The syntax for this section
is outlined below.
-\begin{blockChanged}
\begin{example}
<dc:creator>
@@ -453,7 +438,6 @@
</dcterms:modified>
...
\end{example}
-\end{blockChanged}
The order of elements is as shown above except that elements of
the format contained between \texttt{[[} and \texttt{]]} can occur
@@ -480,7 +464,7 @@
The additional elements of the model history sub-format consist in
sequence of a \token{dc:creator} element, a
\token{dcterms:created} element and zero or more
-\token{dcterms:modified} elements. \changed{The last two} elements must have
+\token{dcterms:modified} elements. The last two elements must have
the attribute \token{rdf:parseType} set to \texttt{Resource}.
The \token{dc:creator} element describes the person who created
@@ -516,7 +500,6 @@
The following shows the annotation of a model with model creation
data and links to external resources:
-\begin{blockChanged}
\begin{example}
<model metaid="_180340" id="GMO" name="Goldbeter1991_MinMitOscil">
<annotation>
@@ -570,12 +553,10 @@
</annotation>
\end{example}
-\end{blockChanged}
-\changed{}The following example shows a \Reaction structure annotated
+The following example shows a \Reaction structure annotated
with a reference to its exact Reactome counterpart.
-\begin{blockChanged}
\begin{example}
<reaction id="cdc2Phospho" metaid="jb007">
<annotation>
@@ -603,12 +584,10 @@
</listOfModifiers>
</reaction>
\end{example}
-\end{blockChanged}
The following example describes a species that represents a
complex between the protein calmodulin and calcium ions:
-\begin{blockChanged}
\begin{example}
<species id="Ca_calmodulin" metaid="cacam">
<annotation>
@@ -628,7 +607,6 @@
</annotation>
</species>
\end{example}
-\end{blockChanged}
The following example describes a species that represents either
``Calcium/calmodulin-dependent protein kinase type II alpha
@@ -637,7 +615,6 @@
cytoplasm of striatal medium-size spiny neurons, where both are
present but they cannot be functionally differentiated.
-\begin{blockChanged}
\begin{example}
<species id="calcium_calmodulin" metaid="cacam">
@@ -653,13 +630,12 @@
<rdf:li rdf:resource="urn:miriam:uniprot:Q13554"/>
</rdf:Bag>
</bqbiol:hasVersion>
- \changed{</rdf:Description>}
+ </rdf:Description>
</rdf:RDF>
</annotation>
</species>
\end{example}
-\end{blockChanged}
The above approach should not be used to describe ``any
Calcium/calmodulin-dependent protein kinase type II chain'',
@@ -685,7 +661,6 @@
example, the following reaction represents the phosphorylation of
a glutamate receptor by a complex calcium/calmodulin kinase II.
-\begin{blockChanged}
\begin{example}
<reaction id="NMDAR_phosphorylation" metaid="thx1138">
<annotation>
@@ -735,15 +710,13 @@
</kineticLaw>
</reaction>
\end{example}
-\end{blockChanged}
The second example of the use of \token{isVersionOf} is the
-complex between Calcium/calmodulin-dependent \changed{}protein kinase type
+complex between Calcium/calmodulin-dependent protein kinase type
II alpha chain and Calcium/calmodulin, that is only one of the
``calcium- and calmodulin-dependent protein kinase complexes''
described by the Gene Ontology term GO:0005954.
-\begin{blockChanged}
\begin{example}
<species id="CaCaMKII" metaid="C8H10N4O2">
<annotation>
@@ -762,7 +735,6 @@
</annotation>
</species>
\end{example}
-\end{blockChanged}
The previous case is different form the following one, although they
could seem similar at first sight. The
@@ -770,7 +742,6 @@
chain'' is a part of the above mentioned ``calcium- and
calmodulin-dependent protein kinase complex''.
-\begin{blockChanged}
\begin{example}
<species id="CaMKIIalpha" metaid="C10H14N2">
<annotation>
@@ -789,7 +760,6 @@
</annotation>
</species>
\end{example}
-\end{blockChanged}
It is possible describe a component with several alternative sets
of qualified annotations. For example, the following species
@@ -799,7 +769,6 @@
annotations are encoded in separate \token{hasVersion} qualifier
elements.
-\begin{blockChanged}
\begin{example}
<species id="GXP" metaid="GXP">
<annotation>
@@ -827,7 +796,6 @@
</annotation>
</species>
\end{example}
-\end{blockChanged}
The following example presents a reaction being actually the
combination of three different elementary molecular reactions. We
@@ -837,7 +805,6 @@
The process represented by the \Reaction structure is
composed of three parts, and not six parts.
-\begin{blockChanged}
\begin{example}
<reaction id="adenineProd" metaid="adeprod">
<annotation>
@@ -865,14 +832,12 @@
</annotation>
</reaction>
\end{example}
-\end{blockChanged}
It is possible to mix different URIs in a given set. The
following example presents two alternative annotations of the human
hemoglobin, the first with ChEBI heme and the second with KEGG
heme.
-\begin{blockChanged}
\begin{example}
<species id="heme" metaid="heme">
<annotation>
@@ -900,14 +865,12 @@
</annotation>
</species>
\end{example}
-\end{blockChanged}
As formally defined above it is possible to use different
qualifiers in the same annotation element. The following
phosphorylation is annotated by its exact KEGG counterpart and by
the generic GO term ``phosphorylation''.
-\begin{blockChanged}
\begin{example}
<reaction id="phosphorylation" metaid="phosphorylation">
<annotation>
@@ -931,4 +894,3 @@
</annotation>
</reaction>
\end{example}
-\end{blockChanged}
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/apdx-changes.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/apdx-changes.tex 2009-03-25 23:33:35 UTC (rev 9428)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/apdx-changes.tex 2009-03-27 09:00:59 UTC (rev 9429)
@@ -1,4 +1,4 @@
-% -*- TeX-master: "sbml-level-2-version-4"; fill-column: 66 -*-
+% -*- TeX-master: "sbml-level-3-version-1-core"; fill-column: 66 -*-
% $Id$
% $HeadURL$
% ----------------------------------------------------------------
@@ -216,13 +216,13 @@
\end{itemize}
-\begin{blockChanged}
+
% Contortion to make the section number be colored for the rest of
% this subsection.
-\renewcommand{\thesubsection}{\changed{\Alph{section}}.\changed{\arabic{subsection}}}
+\renewcommand{\thesubsection}{\Alph{section}.\arabic{subsection}}
-\subsection{\changed{Between Version 4 and Version 3}}
+\subsection{Between Version 4 and Version 3}
The following significant changes exist between \sbmltwothree and
Version~4:
@@ -287,7 +287,7 @@
\item Prior to \sbmltwofour, it was never made clear what, if any,
relationship existed between the sizes of compartments when
compartments defined inside/outside relationships using the
- \token{outside} \changed{attribute}. A new paragraph in
+ \token{outside} attribute. A new paragraph in
Section~\ref{sec:size} of the Version~4 specification makes
clear there is no implication on compartment sizes---the size of
the outside compartment does not include the size(s) of the
@@ -356,10 +356,10 @@
\end{itemize}
-\end{blockChanged}
+
% Restore the section command definition done at the beginning of
% this file.
\renewcommand{\thesubsection}{\Alph{section}.\arabic{subsection}}
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/apdx-fast.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/apdx-fast.tex 2009-03-25 23:33:35 UTC (rev 9428)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/apdx-fast.tex 2009-03-27 09:00:59 UTC (rev 9429)
@@ -1,4 +1,4 @@
-% -*- TeX-master: "sbml-level-2-version-4"; fill-column: 66 -*-
+% -*- TeX-master: "sbml-level-3-version-1-core"; fill-column: 66 -*-
% $Id$
% $HeadURL$
% ----------------------------------------------------------------
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/apdx-mathml-schema.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/apdx-mathml-schema.tex 2009-03-25 23:33:35 UTC (rev 9428)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/apdx-mathml-schema.tex 2009-03-27 09:00:59 UTC (rev 9429)
@@ -1,4 +1,4 @@
-% -*- TeX-master: "sbml-level-2-version-4"; fill-column: 66 -*-
+% -*- TeX-master: "sbml-level-3-version-1-core"; fill-column: 66 -*-
% $Id$
% $HeadURL$
% ----------------------------------------------------------------
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/apdx-overdetermined.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/apdx-overdetermined.tex 2009-03-25 23:33:35 UTC (rev 9428)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/apdx-overdetermined.tex 2009-03-27 09:00:59 UTC (rev 9429)
@@ -1,4 +1,4 @@
-% -*- TeX-master: "sbml-level-2-version-4"; fill-column: 66 -*-
+% -*- TeX-master: "sbml-level-3-version-1-core"; fill-column: 66 -*-
% $Id$
% $HeadURL$
% ----------------------------------------------------------------
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/apdx-processing-notes.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/apdx-processing-notes.tex 2009-03-25 23:33:35 UTC (rev 9428)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/apdx-processing-notes.tex 2009-03-27 09:00:59 UTC (rev 9429)
@@ -1,4 +1,4 @@
-% -*- TeX-master: "sbml-level-2-version-4"; fill-column: 66 -*-
+% -*- TeX-master: "sbml-level-3-version-1-core"; fill-column: 66 -*-
% $Id$
% $HeadURL$
% ----------------------------------------------------------------
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/apdx-release-history.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/apdx-release-history.tex 2009-03-25 23:33:35 UTC (rev 9428)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/apdx-release-history.tex 2009-03-27 09:00:59 UTC (rev 9429)
@@ -1,4 +1,4 @@
-% -*- TeX-master: "sbml-level-2-version-4"; fill-column: 66 -*-
+% -*- TeX-master: "sbml-level-3-version-1-core"; fill-column: 66 -*-
% $Id$
% $HeadURL$
% ----------------------------------------------------------------
@@ -10,8 +10,8 @@
% this file otherwise untouched (it came from L2v3) because
% we only need to change it when it comes time for an L2v4r2.
-\begin{blockChanged}
+
% Contortion to make the section number be colored for the rest of
% this subsection.
\renewcommand{\thesection}{\changed{\Alph{section}}}
@@ -35,7 +35,7 @@
\newcolumntype{P}[1]{>{\raggedright\hspace{0pt}\arraybackslash}p{#1}}
\begin{table}[h]
- \begin{blockChanged}
+
\small
\centering
\begin{tabular}{lP{2.7in}@{\hspace*{15pt}}P{1.25in}P{1.25in}}
@@ -115,11 +115,11 @@
\bottomrule
\end{tabular}
- \end{blockChanged}
+
\end{table}
\begin{table}[t]
- \begin{blockChanged}
+
\small
\centering
\begin{tabular}{lP{2.7in}@{\hspace*{15pt}}P{1.25in}P{1.25in}}
@@ -196,13 +196,13 @@
\bottomrule
\end{tabular}
- \end{blockChanged}
+
\end{table}
-\end{blockChanged}
+
% Restore the section command definition done at the beginning of
% this file.
\renewcommand{\thesection}{\Alph{section}}
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/apdx-schema.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/apdx-schema.tex 2009-03-25 23:33:35 UTC (rev 9428)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/apdx-schema.tex 2009-03-27 09:00:59 UTC (rev 9429)
@@ -1,4 +1,4 @@
-% -*- TeX-master: "sbml-level-2-version-4"; fill-column: 66 -*-
+% -*- TeX-master: "sbml-level-3-version-1-core"; fill-column: 66 -*-
% $Id$
% $HeadURL$
% ----------------------------------------------------------------
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/apdx-validation.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/apdx-validation.tex 2009-03-25 23:33:35 UTC (rev 9428)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/apdx-validation.tex 2009-03-27 09:00:59 UTC (rev 9429)
@@ -1,4 +1,4 @@
-% -*- TeX-master: "sbml-level-2-version-4"; fill-column: 66 -*-
+% -*- TeX-master: "sbml-level-3-version-1-core"; fill-column: 66 -*-
% $Id$
% $HeadURL$
% ----------------------------------------------------------------
@@ -66,12 +66,12 @@
\sbmlrule{10217}
\sbmlrule{10218}
-\begin{blockChanged}
+
\sbmlrule{10219}
-\end{blockChanged}
+
% [2006-03-30 MH] Not sure how to encode the following concept, so
% I'm leaving it out for now:
% All other operators, values and symbols return numeric results.
@@ -96,7 +96,7 @@
\sbmlrule{10402}
\sbmlrule{10403}
-\end{sbmlenum} \subsection*{General unit validation \changed{(Warnings only)}} \begin{sbmlenum}
+\end{sbmlenum} \subsection*{General unit validation (Warnings only)} \begin{sbmlenum}
\sbmlrule{10501}
\sbmlrule{10511}
@@ -118,7 +118,7 @@
\sbmlrule{10601}
-\end{sbmlenum} \subsection*{General SBO validation \changed{(Warnings only)}} \begin{sbmlenum}
+\end{sbmlenum} \subsection*{General SBO validation (Warnings only)} \begin{sbmlenum}
\sbmlrule{10701}
\sbmlrule{10702}
@@ -162,12 +162,12 @@
\sbmlrule{20301}
-\begin{blockChanged}
+
\sbmlrule{20302}
-\end{blockChanged}
+
\sbmlrule{20303}
\sbmlrule{20304}
\sbmlrule{20305}
@@ -280,12 +280,12 @@
\sbmlrule{21204}
\sbmlrule{21205}
-\begin{blockChanged}
+
\sbmlrule{21206}
-\end{blockChanged}
+
\end{sbmlenum} \subsection*{\class{EventAssignment} validation} \begin{sbmlenum}
\sbmlrule{21211}
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/components.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/components.tex 2009-03-25 23:33:35 UTC (rev 9428)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/components.tex 2009-03-27 09:00:59 UTC (rev 9429)
@@ -1,4 +1,4 @@
-% -*- TeX-master: "sbml-level-2-version-4"; fill-column: 66 -*-
+% -*- TeX-master: "sbml-level-3-version-1-core"; fill-column: 66 -*-
% $Id$
% $HeadURL$
% ----------------------------------------------------------------
@@ -19,7 +19,7 @@
\label{sec:sbml}
%-----------------------------------------------------------------------------
-All well-formed \changed{SBML} documents must begin with an \emph{XML
+All well-formed SBML documents must begin with an \emph{XML
declaration}, which specifies both the version of XML assumed
and the document character encoding. The declaration begins with
the characters \token{<?xml} followed by the XML \token{version}
@@ -41,9 +41,9 @@
[open triangle 60-,edge from parent fork down,sibling distance=2.65in]
child {node (a) {
\begin{classbox}{Sbml}
- xmlns: string \{ "http://www.sbml.org/sbml/level2/version\changed{4}" \} \\
+ xmlns: string \{ "http://www.sbml.org/sbml/level2/version4" \} \\
level: positiveInteger \{ use="required" fixed="2" \} \\
- version: positiveInteger \{ use="required" fixed="\changed{4}" \} \\
+ version: positiveInteger \{ use="required" fixed="4" \} \\
\end{classbox}
}}
child {node (b) {
@@ -62,18 +62,18 @@
\end{figure}
The following is an abbreviated example of these XML elements for
-an SBML Level~2 Version~\changed{4} document:
+an SBML Level~2 Version~4 document:
\begin{example}
<?xml version="1.0" encoding="UTF-8"?>
-<sbml xmlns="http://www.sbml.org/sbml/level2/version\changed{4}" level="2" version="\changed{4}">
+<sbml xmlns="http://www.sbml.org/sbml/level2/version4" level="2" version="4">
...
</sbml>
\end{example}
The attribute \token{xmlns} declares the default XML namespace
-used within the \token{sbml} element. The URI for SBML Level~2 Version~\changed{4}
-is \uri{http://www.sbml.org/sbml/level2/version\changed{4}}. All
+used within the \token{sbml} element. The URI for SBML Level~2 Version~4
+is \uri{http://www.sbml.org/sbml/level2/version4}. All
elements must be placed in this namespace either by assigning the
default namespace as shown above, or using a tag prefix on
every element.
@@ -166,7 +166,7 @@
xxxx\=xxxx\=xxxx\=xxxx\=xxxx\=\kill
\+\>
<?xml version="1.0" encoding="UTF-8"?>\\
-<sbml xmlns="http://www.sbml.org/sbml/level2/version\changed{4}" level="2" version="\changed{4}">\\
+<sbml xmlns="http://www.sbml.org/sbml/level2/version4" level="2" version="4">\\
\><model id="My\_Model">\\
\>\><listOfFunctionDefinitions>\\
\>\>\>\textrm{\emph{one or more}} <functionDefinition> ... </functionDefinition> \textrm{\emph{elements}} \` \sayOptional\\
@@ -254,15 +254,15 @@
The \Model object has an optional \token{sboTerm} attribute of
type \primtype{SBOTerm} (see Sections~\ref{sec:sboterm-type}
-and~\ref{sec:sboTerm}). Values of this attribute \changed{should} be chosen
+and~\ref{sec:sboTerm}). Values of this attribute should be chosen
from identifiers referring to an interaction defined in SBO (\ie
-terms derived from \changed{\sbointeraction}). The SBO term
+terms derived from \sbointeraction). The SBO term
chosen should be the most precise (narrow) term that defines the
-\changed{overall process or phenomenon represented by the overall SBML
- model}.
+overall process or phenomenon represented by the overall SBML
+ model.
-\begin{blockChanged}
+
Prior to \sbmltwofour, the SBML specifications stipulated that the
SBO branch for \Model had be the mathematical framework
branch of SBO. This turned out to be confusing and problematic.
@@ -272,9 +272,9 @@
branch of \sbointeraction, an appropriate one for the
\token{sboTerm} value on an SBML \Model.
-\end{blockChanged}
+
%-----------------------------------------------------------------------------
\subsection{Function definitions}
\label{sec:functiondefinition}
@@ -351,8 +351,8 @@
\subsubsection{The \token{math} element}
\label{sec:function-definition-math}
-\begin{blockChanged}
+
The \token{math} element is a container for MathML
content that defines the function. The content of this
element can only be a MathML \token{lambda} element
@@ -365,15 +365,15 @@
element). This is the only place in SBML where a \token{lambda}
element can be used.
-\end{blockChanged}
+
A further restriction on the content of \token{math} is that it
cannot contain references to variables other than the variables
declared to the \token{lambda} itself. That is, the contents of
MathML \token{ci} elements inside the body of the \token{lambda}
can only be the variables declared by its \token{bvar} elements,
-or the identifiers of other \FunctionDefinition{}s \changed{defined in
-the same} model. This restriction also applies to the
+or the identifiers of other \FunctionDefinition{}s defined in
+the same model. This restriction also applies to the
\token{csymbol} for \quantity{time}. Functions must be written
so that all variables or parameters used in the MathML content are
passed to them via their function parameters.
@@ -386,7 +386,7 @@
attribute of type \primtype{SBOTerm} from its parent
class \SBase (see Sections~\ref{sec:sboterm-type}
and~\ref{sec:sboTerm}). When a value is given to this
-attribute in a \FunctionDefinition instance, it \changed{should} be an
+attribute in a \FunctionDefinition instance, it should be an
SBO identifier referring to a mathematical expression
(\ie terms derived from \sbomathformula). The relationship is
of the form ``the function definition \emph{is a} X'', where X is
@@ -399,8 +399,8 @@
benefit of SBO labels.
-\begin{blockChanged}
+
\subsubsection{Calling user-defined functions}
\label{sec:functiondefinition-calling}
@@ -411,8 +411,8 @@
elements inside the \token{lambda} element of the function
definition.
-\end{blockChanged}
+
Note that \FunctionDefinition does not have a separate attribute
for defining the units of the value returned by the function. The
units associated with the function's return value, when the
@@ -494,9 +494,9 @@
object, SBML provides a facility for defining units that can be
referenced throughout a model. In addition, every kind of SBML
mathematical entity has units assigned to it from a set of
-\changed{predefined} defaults (see Section~\ref{sec:predefined-units} below, and
+predefined defaults (see Section~\ref{sec:predefined-units} below, and
also Sections~\ref{sec:compartment-units}, \ref{sec:species-units}
-and~\ref{subsec:kinetic-law}). By redefining these \changed{predefined}
+and~\ref{subsec:kinetic-law}). By redefining these predefined
units, it is possible to change the units used throughout
a model in a simple and consistent manner. The SBML unit
definition facility uses two classes of objects, \UnitDefinition
@@ -601,8 +601,8 @@
reserved base unit names. This constraint simply prevents
the redefinition of base units.
-\item There is a set of \changed{reserved} identifiers for the
- \changed{predefined} units in SBML; these identifiers are \val{substance},
+\item There is a set of reserved identifiers for the
+ predefined units in SBML; these identifiers are \val{substance},
\val{volume}, \val{area}, \val{length}, and \val{time}. Using
one of these values for \token{id} in a \UnitDefinition has the
effect of redefining the model-wide default units for the
@@ -660,11 +660,11 @@
In \sbmltwoone, \Unit had an additional
attribute called \token{offset}. This
attribute has been removed entirely in Level~2
-Versions~\changed{2--4}. Modelers and software authors are
+Versions~2--4. Modelers and software authors are
instead directed to use other methods of encoding units requiring
offsets. The reasons for this change, and some suggestions for
how to achieve equivalent effects of unit offsets, are discussed
-in more detail below. Another change in Version~3 \changed{and~4} is the
+in more detail below. Another change in Version~3 and~4 is the
removal of the enumeration \primtype{UnitKind} and the
redefinition of \primtype{UnitSId} to include the previous
\primtype{UnitKind} values as reserved symbols. This change has
@@ -907,7 +907,7 @@
software. In the development of \sbmltwotwo, a consensus among
SBML developers emerged that a fully generalized unit scheme
is so confusing and complicated that it actually impedes
-interoperability. SBML Level~2 \changed{Versions 2--4} acknowledge this reality by reducing
+interoperability. SBML Level~2 Versions 2--4 acknowledge this reality by reducing
and simplifying the unit system, specifically by removing the
\token{offset} attribute on \Unit and Celsius as a pre-defined unit,
and by describing approaches for handling Celsius and other
@@ -997,7 +997,7 @@
All of these approaches provide general solutions to the problem
of supporting any units requiring offsets in the unit system of
- SBML Level~2 \changed{Versions 2--4}. It can be used for other temperature units
+ SBML Level~2 Versions 2--4. It can be used for other temperature units
requiring an offset (\eg degrees Rankine, degrees R\'{e}aumur),
although the likelihood of a real-life model requiring such
other temperature units seems exceedingly small.
@@ -1033,7 +1033,7 @@
\end{example}
-\subsubsection{\changed{Predefined} units}
+\subsubsection{Predefined units}
\label{sec:predefined-units}
There are five special unit identifiers in SBML, listed in
@@ -1060,26 +1060,26 @@
\token{time} & second, dimensionless & second\\
\bottomrule
\end{edtable}
- \caption{SBML's \changed{predefined} units. The identifiers in the
+ \caption{SBML's predefined units. The identifiers in the
left-most column are values of \primtype{UnitSId}
(Section~\ref{sec:unitsid}).}
\label{tab:predefined}
\end{table}
-\paragraph{Redefinition of \changed{predefined} units}
+\paragraph{Redefinition of predefined units}
Table~\ref{tab:predefined} also lists alternative base units that are
allowed as the basis of redefined values. For example, a
-redefinition of the \changed{predefined} unit of time must be based on units
+redefinition of the predefined unit of time must be based on units
of seconds. Within certain limits, a model may change the
-\changed{predefined} units by reassigning the keywords \token{substance},
+predefined units by reassigning the keywords \token{substance},
\token{length}, \token{area}, \token{time}, and \token{volume} in
a \UnitDefinition. The limitations on redefinitions of base units
are the following:
\begin{enumerate}
-\item The \UnitDefinition \changed{involving a predefined} unit can only
+\item The \UnitDefinition involving a predefined unit can only
contain a single \Unit object within it.
\item The value of the \token{kind} attribute in
@@ -1093,8 +1093,8 @@
\end{enumerate}
-\begin{blockChanged}
+
Certain choices of base units as values of the \token{kind}
attribute require specific choices of the \token{exponent}
attribute in the unit definition. Specifically, if volume is
@@ -1105,13 +1105,13 @@
\token{dimensionless} is used as the value of \token{kind}, then
the \token{exponent} value can be any integer.
-\end{blockChanged}
+
\paragraph{Examples}
-The following example illustrates how to change \changed{a model's
- global default} units
+The following example illustrates how to change a model's
+ global default units
of volume to be millilitres. If this definition appeared in a
model, the units of volume on all components that did not
explicitly specify different units would be changed to
@@ -1143,7 +1143,7 @@
\item The base units listed in Table~\vref{tab:unitkind}; and
-\item The \changed{predefined} units defined in
+\item The predefined units defined in
Section~\ref{sec:predefined-units} and listed in
Table~\ref{tab:predefined}. (These are \val{substance},
\val{volume}, \val{area}, \val{length}, and \val{time}.)
@@ -1275,9 +1275,9 @@
\AlgebraicRule, and in addition, for simulation time $t > 0$, it
may also be changed by a \RateRule or \Event{}s. (However, some
constructs are mutually exclusive; see Sections~\ref{sec:rules}
-and~\ref{sec:events}.) It is not an error to \changed{set the value of \token{size}}
+and~\ref{sec:events}.) It is not an error to set the value of \token{size}
on a compartment and also redefine the value using an
-\InitialAssignment, but the \changed{original} \token{size} value in that case is
+\InitialAssignment, but the original \token{size} value in that case is
ignored. Section~\ref{sec:before-t0} provides additional
information about the semantics of assignments, rules and values
for simulation time $t \leq 0$.
@@ -1285,49 +1285,49 @@
For the reasons given above, the \token{size} attribute on a
compartment must be defined as optional; however, \emph{it is
extremely good practice to specify values for compartment sizes}
-when such values are available. There are \changed{three} major
-technical reasons for this. First, \changed{if the model contains
-any species whose initial amounts are} \changed{given in terms of
+when such values are available. There are three major
+technical reasons for this. First, if the model contains
+any species whose initial amounts are given in terms of
concentrations, and there is at least one reaction in the model
-referencing such a species,} \changed{then the model is numerically
+referencing such a species, then the model is numerically
incomplete if it lacks a value for the size of the compartment in
-which the} \changed{species is located. The reason is simply that SBML
+which the species is located. The reason is simply that SBML
\Reaction{}s are defined in units of
\quantity{substance}/\quantity{time} (see
Section~\ref{subsec:kinetic-law}), not concentration per time, and
-thus the compartment size must at some point be used to} \changed{convert
-from species concentration to substance units. Second,} models
+thus the compartment size must at some point be used to convert
+from species concentration to substance units. Second, models
ideally should be instantiable in a variety of simulation
frameworks. A commonly-used one is the discrete stochastic
framework~\citep{gillespie:1977,wilkinson_2006} in which species
are represented as item counts (\eg molecule counts). If species'
initial quantities are given in terms of concentrations or
densities, it is impossible to convert the values to item counts
-without knowing compartment sizes. \changed{Third},
+without knowing compartment sizes. Third,
if a model contains multiple compartments whose sizes are not all
identical to each other, it is impossible to quantify the reaction
rate expressions without knowing the compartment volumes. The
-reason for the latter is \changed{again} that reaction rates in SBML are defined
+reason for the latter is again that reaction rates in SBML are defined
in terms of \quantity{substance}/\quantity{time}, and when species quantities are
given in terms of concentrations or densities, the compartment
sizes become factors in the reaction rate expressions.
-\begin{blockChanged}
+
A final question to address is, what are the relationships between
compartment sizes when compartment positioning is expressed using
the \token{outside} attribute
(Section~\ref{sec:compartment-outside})? The answer is: none.
-The size of a \changed{given} compartment does not in any sense include the
+The size of a given compartment does not in any sense include the
sizes of other compartments having it as the value of their
\token{outside} attributes. In other words, if a compartment
\emph{B} has the identifier of compartment \emph{A} as its
\token{outside} attribute value, the size of \emph{A} does not
include the size of \emph{B}. The compartment sizes are separate.
-\end{blockChanged}
+
\subsubsection{The \token{units} attribute}
\label{sec:compartment-units}
@@ -1337,7 +1337,7 @@
\token{units}, interact with the number of spatial dimensions of
the compartment. The value of the \token{units} attribute of a
\Compartment object must be one of the base units from
-Table~\ref{tab:unitkind}, or the \changed{predefined} unit \changed{identifiers} \val{volume},
+Table~\ref{tab:unitkind}, or the predefined unit identifiers \val{volume},
\val{area}, \val{length} or \val{dimensionless}, or a new unit
defined by a unit definition in the enclosing model, subject to
the restrictions detailed in Table~\ref{tab:comp-size-units}.
@@ -1446,28 +1446,28 @@
\label{sec:compartment-outside}
The optional attribute \token{outside} of type \primtype{SId} can be
-used to express \changed{one type of positioning} relationship between compartments. If
+used to express one type of positioning relationship between compartments. If
present, the value of \token{outside} for a given compartment must
-be the \token{id} attribute value of another \changed{compartment
-defined in the model}. Doing so means that the other compartment
-\changed{surrounds} it or is ``outside'' of it. This enables the
+be the \token{id} attribute value of another compartment
+defined in the model. Doing so means that the other compartment
+surrounds it or is ``outside'' of it. This enables the
representation of simple topological relationships between
compartments, for those simulation systems that can make use of
the information (e.g., for drawing simple diagrams of
compartments).
-There are two restrictions on the \changed{inside/outside} relationships in SBML.
+There are two restrictions on the inside/outside relationships in SBML.
First, because a compartment with
\token{spatialDimensions} of \val{0} has no size, such a
-compartment cannot act as the \changed{``outside''} of any other compartment
+compartment cannot act as the ``outside'' of any other compartment
\emph{except} compartments that \emph{also} have
\token{spatialDimensions} values of \val{0}. Second, the directed
graph formed by representing \Compartment objects as vertexes
and the \token{outside} attribute values as edges must be acyclic.
The latter condition is imposed to prevent a compartment from
-being \changed{located} inside itself.
+being located inside itself.
-Although \changed{inside/outside} relationships are partly taken into account
+Although inside/outside relationships are partly taken into account
by the compartmental localization of reactants and products, it is
not always possible to determine purely from the reaction
equations whether \textcolor{black}{one} compartment is meant to be located within
@@ -1480,8 +1480,8 @@
Section~\ref{sec:level-3}, SBML Level~3 is expected introduce the
ability to define geometries and spatial qualities.)
-\begin{blockChanged}
+
Finally, as mentioned in Section~\ref{sec:size} above, the
presence of \token{outside} attributes in compartment definitions
has no implications whatsoever about the sizes (or any other
@@ -1491,9 +1491,9 @@
\token{outside} attribute only provides semantic information and
has no impact on mathematical analysis and simulation.
-\end{blockChanged}
+
\subsubsection{The \token{sboTerm} attribute}
\label{sec:compartment-sboterm}
@@ -1501,12 +1501,12 @@
attribute of type \primtype{SBOTerm} from its parent
class \SBase (see Sections~\ref{sec:sboterm-type}
and~\ref{sec:sboTerm}). When a value is given to this
-attribute in a \Compartment instance, the value \changed{should} be
-an SBO identifier referring to a \changed{material entity} (\ie
-terms derived from \changed{\sbomaterialentity}). The relationship is
+attribute in a \Compartment instance, the value should be
+an SBO identifier referring to a material entity (\ie
+terms derived from \sbomaterialentity). The relationship is
of the form ``the compartment \emph{is a} X'', where X is the SBO
term. The term chosen should be the most precise (narrow) one
-that captures the role of the \changed{compartment} in the model.
+that captures the role of the compartment in the model.
\subsubsection{Examples}
@@ -1595,7 +1595,7 @@
In previous versions of SBML Level~2, the class \Species included
an attribute called \token{spatialSizeUnits}, which allowed
explicitly setting the units of \emph{size} for initial
-concentration. \sbmltwothree \changed{removed} this attribute for two
+concentration. \sbmltwothree removed this attribute for two
reasons. First, its semantics were confusing and introduced an
implicit unit conversion. \Compartment has its own size-setting
attribute, and a separate attribute on \Species meant that a
@@ -1778,13 +1778,13 @@
definitions.
The value chosen for \token{substanceUnits} must be
-either a base unit from Table~\vref{tab:unitkind}, a \changed{predefined} unit
+either a base unit from Table~\vref{tab:unitkind}, a predefined unit
from Table~\vref{tab:predefined}, or a new unit defined by a unit
definition in the enclosing model. The chosen units for
\token{substanceUnits} must be be \token{dimensionless},
\token{mole}, \token{item}, \token{kilogram}, \token{gram}, or
units derived from these. The \token{substanceUnits}
-attribute defaults to the the \changed{predefined} unit
+attribute defaults to the the predefined unit
``\token{substance}'' shown in Table~\vref{tab:predefined}.
The \emph{units of the species} are used in the following ways:
@@ -1796,13 +1796,13 @@
Section~\ref{sec:ci-token}).
\item The \token{math} element of an \AssignmentRule or
- \InitialAssignment referring to this species \changed{should} have identical
+ \InitialAssignment referring to this species should have identical
units (see Sections~\ref{sec:assignmentrule}
and~\ref{sec:initialAssignment}).
\item In \RateRule objects that set the rate of change of the
species' quantity (Section~\ref{sec:raterule}), the units of the
- rule's \token{math} element \changed{should} be identical to the
+ rule's \token{math} element should be identical to the
\quantity{units of the species} divided by the model's
\quantity{time} units.
@@ -1908,10 +1908,10 @@
of type \primtype{SBOTerm} from its parent class \SBase (see
Sections~\ref{sec:sboterm-type} and~\ref{sec:sboTerm}). When a
value is given to this attribute in a \Species instance,
-the value \changed{should} be an SBO identifier referring to a \changed{material entity} (\ie terms derived from \changed{\sbomaterialentity}).
+the value should be an SBO identifier referring to a material entity (\ie terms derived from \sbomaterialentity).
The relationship is of the form ``the species \emph{is a} X'',
where X is the SBO term. The term chosen should be the most
-precise (narrow) one that captures the role of the \changed{species}
+precise (narrow) one that captures the role of the species
in the model.
@@ -2053,7 +2053,7 @@
by the attribute \token{units}. The value assigned to
the parameter's \token{units} attribute must be chosen
from one of the following possibilities: one of the base unit
-identifiers from Table~\vref{tab:unitkind}; one of the \changed{predefined}
+identifiers from Table~\vref{tab:unitkind}; one of the predefined
unit identifiers appearing in first column of
Table~\vref{tab:predefined}; or the identifier of a new unit defined
in the list of unit definitions in the enclosing \Model definition.
@@ -2070,11 +2070,11 @@
\item The units of the \token{math} element of an \AssignmentRule,
\InitialAssignment or \EventAssignment setting the value of the
- parameter \changed{should be identical to the units} declared by the
+ parameter should be identical to the units declared by the
parameter's \token{units} attribute.
\item The units of the \token{math} element of a \RateRule that
- references the parameter \changed{should} be identical to \quantity{parameter
+ references the parameter should be identical to \quantity{parameter
units}/\quantity{time}, where \quantity{parameter units} are
the units declared for the parameter using the \token{units}
attribute and \quantity{time} is the model-wide \token{time}
@@ -2124,7 +2124,7 @@
The \Parameter object inherits from \SBase the optional \token{sboTerm} attribute of
type \primtype{SBOTerm} (see Sections~\ref{sec:sboterm-type}
and~\ref{sec:sboTerm}). When a value is given to this attribute in a
-parameter definition, the value \changed{should} be an SBO identifier
+parameter definition, the value should be an SBO identifier
referring to a quantitative parameter defined in SBO (\ie terms
derived from \sboparameter). The relationship is of the form
``the SBML parameter \emph{is a} X'', where X is the SBO term.
@@ -2252,9 +2252,9 @@
The \token{math} element contains a MathML expression that is used
to calculate the value of the constant or the initial value of the
variable. The units of the value computed by the formula in the
-\token{math} element \changed{should} be identical to be the units associated with the
+\token{math} element should be identical to be the units associated with the
identifier given in the \token{symbol} attribute. (That is, the units
-\changed{should be} the units of the species, compartment, or parameter, as
+should be the units of the species, compartment, or parameter, as
appropriate for the kind of object identified by the value of
\token{symbol}.)
@@ -2265,7 +2265,7 @@
\InitialAssignment inherits from \SBase an optional \token{sboTerm} attribute of type
\primtype{SBOTerm} (see Sections~\ref{sec:sboterm-type}
and~\ref{sec:sboTerm}). When a value is given to this attribute in an
-initial assignment definition, the value \changed{should} be a valid SBO
+initial assignment definition, the value should be a valid SBO
identifier referring to a mathematical expression (\ie terms
derived from \sbomathformula). The \InitialAssignment object
should have a ``is a'' relationship with the SBO term, and the
@@ -2315,7 +2315,7 @@
\item \emph{In the case of a compartment}, an \InitialAssignment
sets the referenced compartment's initial size to the size
determined by the formula in \token{math}. The overall units of
- the formula \changed{should} be the same as the units specified for the size of the
+ the formula should be the same as the units specified for the size of the
compartment. (See Section~\ref{sec:compartment-units} for an
explanation of how the units of the compartment's size are
determined.)
@@ -2323,7 +2323,7 @@
\item \emph{In the case of a parameter}, an \InitialAssignment
sets the referenced parameter's initial value to that determined
by the formula in \token{math}. The overall units of the
- formula \changed{should} be the same as the units defined for the parameter. (See
+ formula should be the same as the units defined for the parameter. (See
Section~\ref{sec:parameter-units} for an explanation of how the
units of the parameter are determined.)
@@ -2555,7 +2555,7 @@
The \Rule object class inherits from \SBase the optional \token{sboTerm} attribute of type
\primtype{SBOTerm} (see Sections~\ref{sec:sboterm-type}
and~\ref{sec:sboTerm}). When a value is given to this attribute, it
-\changed{should} be a valid SBO identifier referring to a mathematical
+should be a valid SBO identifier referring to a mathematical
expression defined in SBO (\ie terms derived from
\sbomathformula). The \AlgebraicRule, \AssignmentRule, or
\RateRule object should have a ``is a'' relationship with the SBO
@@ -2586,8 +2586,8 @@
additional information about the semantics of assignments, rules,
and entity values for simulation time $t \leq 0$.
-\begin{blockChanged}
+
The ability to define arbitrary algebraic expressions in an SBML
model introduces the possibility that a model is mathematically
overdetermined by the overall system of equations constructed from
@@ -2595,9 +2595,9 @@
overdetermined; this is discussed in
Section~\ref{sec:ruleconstraints} below.
-\end{blockChanged}
+
\subsubsection{\class{AssignmentRule}}
\label{sec:assignmentrule}
@@ -2616,7 +2616,7 @@
referenced species' quantity (\quantity{concentration} or
\quantity{amount of substance}) to the value determined by the
formula in \token{math}. The units of the formula in
- \token{math} \changed{should} be the same as the \emph{units of the species}
+ \token{math} should be the same as the \emph{units of the species}
(Section~\ref{sec:species-units}) for the species identified by
the \token{variable} attribute of the \AssignmentRule.
@@ -2631,13 +2631,13 @@
\item \emph{In the case of a compartment}, an \AssignmentRule sets
the referenced compartment's size to the value determined by the
formula in \token{math}. The overall units of the formula in
- \token{math} \changed{should} be the same as the units of the size of the
+ \token{math} should be the same as the units of the size of the
compartment (Section~\ref{sec:compartment-units}).
\item \emph{In the case of a parameter}, an \AssignmentRule sets
the referenced parameter's value to that determined by the
formula in \token{math}. The overall units of the formula in
- \token{math} \changed{should} be the same as the units defined for the
+ \token{math} should be the same as the units defined for the
parameter (Section~\ref{sec:parameter-units}).
\end{itemize}
@@ -2699,9 +2699,9 @@
of change of the species' quantity (\quantity{concentration} or
\quantity{amount of substance}) to the value determined by the
formula in \token{math}. The overall units of the formula in
- \token{math} \changed{should} be \quantity{species
+ \token{math} should be \quantity{species
quantity}/\quantity{time}, where the \quantity{time} units are
- the \changed{predefined} units of time described in
+ the predefined units of time described in
Section~\ref{sec:unitdefinitions} and the \quantity{species
quantity} units are the \emph{units of the species} as defined
in Section~\ref{sec:species-units}.
@@ -2717,15 +2717,15 @@
\item \emph{In the case of a compartment}, a \RateRule sets the
rate of change of the compartment's size to the value determined
by the formula in \token{math}. The overall units of the
- formula \changed{should} be \quantity{size}/\quantity{time}, where the
- \quantity{time} units are the \changed{predefined} units of time described
+ formula should be \quantity{size}/\quantity{time}, where the
+ \quantity{time} units are the predefined units of time described
in Section~\ref{sec:unitdefinitions} and the \quantity{size}
units are the units of size on the compartment
(Section~\ref{sec:compartment-units}).
\item \emph{In the case of a parameter}, a \RateRule sets the rate
of change of the parameter's value to that determined by the
- formula in \token{math}. The overall units of the formula \changed{should}
+ formula in \token{ma...
[truncated message content] |
|
From: <fbe...@us...> - 2009-03-25 23:33:55
|
Revision: 9428
http://sbml.svn.sourceforge.net/sbml/?rev=9428&view=rev
Author: fbergmann
Date: 2009-03-25 23:33:35 +0000 (Wed, 25 Mar 2009)
Log Message:
-----------
- removed all references to CompartmentType / SpeciesType, it still has to be changed in figures and examples though
Modified Paths:
--------------
trunk/specifications/sbml-level-3/version-1/core/spec/apdx-changes.tex
trunk/specifications/sbml-level-3/version-1/core/spec/apdx-schema.tex
trunk/specifications/sbml-level-3/version-1/core/spec/components.tex
trunk/specifications/sbml-level-3/version-1/core/spec/config.tex
trunk/specifications/sbml-level-3/version-1/core/spec/examples.tex
trunk/specifications/sbml-level-3/version-1/core/spec/listof-illustration.tex
trunk/specifications/sbml-level-3/version-1/core/spec/preliminary.tex
trunk/specifications/sbml-level-3/version-1/core/spec/sbo.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10301.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10714.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10715.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20202.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20203.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20510.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20612.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20613.tex
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/apdx-changes.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/apdx-changes.tex 2009-03-25 16:37:02 UTC (rev 9427)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/apdx-changes.tex 2009-03-25 23:33:35 UTC (rev 9428)
@@ -301,21 +301,23 @@
\token{bqbiol:occursIn}. Section~\ref{sec:annotation-standard}
now includes these qualifiers.
-\item Since the time that \sbmltwothree Release~2 was issued, the
- Systems Biology Ontology (SBO) underwent reorganization and
- improvement. This required numerous changes to
- Section~\ref{sec:sbo} to be consistent with SBO now. Chief
- among the changes that impact SBML models are that (1) the SBO
- branches for \Model, \CompartmentType, \SpeciesType,
- \Compartment and \Species have all changed slightly, and (2) the
- \sbmltwofour specification does not \emph{require} specific
- choices for \token{sboTerm} attribute values, only
- \emph{recommends} them.
+% FTB: The following sections really should go, for now i comment them
+% out, as the CompartmentType and SpeciesType macros are no longer there.
+% \item Since the time that \sbmltwothree Release~2 was issued, the
+% Systems Biology Ontology (SBO) underwent reorganization and
+% improvement. This required numerous changes to
+% Section~\ref{sec:sbo} to be consistent with SBO now. Chief
+% among the changes that impact SBML models are that (1) the SBO
+% branches for \Model, \CompartmentType, \SpeciesType,
+% \Compartment and \Species have all changed slightly, and (2) the
+% \sbmltwofour specification does not \emph{require} specific
+% choices for \token{sboTerm} attribute values, only
+% \emph{recommends} them.
-\item There were some cut-and-paste errors in the text of the
- descriptions of the \token{sboTerm} attribute on several SBML
- components such as \Species, \SpeciesType, and others. The text
- of the Version~4 specification includes corrections for this.
+%\item There were some cut-and-paste errors in the text of the
+% descriptions of the \token{sboTerm} attribute on several SBML
+% components such as \Species, \SpeciesType, and others. The text
+% of the Version~4 specification includes corrections for this.
\item Prior Versions of \sbmltwo used three validation rules,
20406, 20407, and~20408, to encode requirements about the
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/apdx-schema.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/apdx-schema.tex 2009-03-25 16:37:02 UTC (rev 9427)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/apdx-schema.tex 2009-03-25 23:33:35 UTC (rev 9428)
@@ -204,28 +204,11 @@
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
- <xsd:complexType name="CompartmentType">
- <xsd:complexContent>
- <xsd:extension base="SBase">
- <xsd:attribute name="id" type="SId" use="required"/>
- <xsd:attribute name="name" type="xsd:string" use="optional"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- <xsd:complexType name="SpeciesType">
- <xsd:complexContent>
- <xsd:extension base="SBase">
- <xsd:attribute name="id" type="SId" use="required"/>
- <xsd:attribute name="name" type="xsd:string" use="optional"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
<xsd:complexType name="Compartment">
<xsd:complexContent>
<xsd:extension base="SBase">
<xsd:attribute name="id" type="SId" use="required"/>
<xsd:attribute name="name" type="xsd:string" use="optional"/>
- <xsd:attribute name="compartmentType" type="SId" use="optional"/>
<xsd:attribute name="spatialDimensions" use="optional" default="3">
<xsd:simpleType>
<xsd:restriction base="xsd:int">
@@ -247,7 +230,6 @@
<xsd:extension base="SBase">
<xsd:attribute name="id" type="SId" use="required"/>
<xsd:attribute name="name" type="xsd:string" use="optional"/>
- <xsd:attribute name="speciesType" type="SId" use="optional"/>
<xsd:attribute name="compartment" type="SId" use="required"/>
<xsd:attribute name="initialAmount" type="xsd:double" use="optional"/>
<xsd:attribute name="initialConcentration" type="xsd:double" use="optional"/>
@@ -513,32 +495,6 @@
</xsd:complexContent>
</xsd:complexType>
</xsd:element>
- <xsd:element name="listOfCompartmentTypes" minOccurs="0">
- <xsd:complexType>
- <xsd:complexContent>
- <xsd:extension base="SBase">
- <xsd:sequence>
- <xsd:element name="compartmentType"
- type="CompartmentType"
- maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="listOfSpeciesTypes" minOccurs="0">
- <xsd:complexType>
- <xsd:complexContent>
- <xsd:extension base="SBase">
- <xsd:sequence>
- <xsd:element name="speciesType"
- type="SpeciesType"
- maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- </xsd:element>
<xsd:element name="listOfCompartments" minOccurs="0">
<xsd:complexType>
<xsd:complexContent>
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/components.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/components.tex 2009-03-25 16:37:02 UTC (rev 9427)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/components.tex 2009-03-25 23:33:35 UTC (rev 9428)
@@ -128,7 +128,6 @@
\vspace*{-1.1ex}
\caption{The definition of \Model and the many helper
classes \ListOfFunctionDefinitions, \ListOfUnitDefinitions,
- \ListOfCompartmentTypes, \ListOfSpeciesTypes,
\ListOfCompartments, \ListOfSpecies, \ListOfParameters,
\ListOfInitialAssignments, \ListOfRules, \ListOfConstraints,
\ListOfReactions, and \ListOfEvents.}
@@ -144,13 +143,11 @@
Section~\ref{sec:idnameattribs}.
\Model serves as a container for components of classes
-\FunctionDefinition, \UnitDefinition, \CompartmentType,
-\SpeciesType, \Compartment, \Species, \Parameter,
+\FunctionDefinition, \UnitDefinition, \Compartment, \Species, \Parameter,
\InitialAssignment, \Rule, \Constraint, \Reaction and \Event.
Instances of the classes are placed inside instances of classes
\ListOfFunctionDefinitions, \ListOfUnitDefinitions,
-\ListOfCompartmentTypes, \ListOfSpeciesTypes, \ListOfCompartments,
-\ListOfSpecies, \ListOfParameters, \ListOfInitialAssignments,
+\ListOfCompartments, \ListOfSpecies, \ListOfParameters, \ListOfInitialAssignments,
\ListOfRules, \ListOfConstraints, \ListOfReactions, and
\ListOfEvents. The ``list'' classes are defined in
Figure~\ref{fig:model}. All of the lists are optional, but if a
@@ -177,12 +174,6 @@
\>\><listOfUnitDefinitions>\\
\>\>\>\textrm{\emph{one or more}} <unitDefinition> ... </unitDefinition> \textrm{\emph{elements}} \` \sayOptional\\
\>\></listOfUnitDefinitions>\\
-\>\><listOfCompartmentTypes>\\
-\>\>\>\textrm{\emph{one or more}} <compartmentType> ... </compartmentType> \textrm{\emph{elements}} \` \sayOptional\\
-\>\></listOfCompartmentTypes>\\
-\>\><listOfSpeciesTypes>\\
-\>\>\>\textrm{\emph{one or more}} <speciesType> ... </speciesType> \textrm{\emph{elements}} \` \sayOptional\\
-\>\></listOfSpeciesTypes>\\
\>\><listOfCompartments>\\
\>\>\>\textrm{\emph{one or more}} <compartment> ... </compartment> \textrm{\emph{elements}} \` \sayOptional\\
\>\></listOfCompartments>\\
@@ -226,8 +217,6 @@
\label{sec:listof}
\label{sec:listofunitdefinitions}
\label{sec:listoffunctiondefinitions}
-\label{sec:listofcompartmenttypes}
-\label{sec:listofspeciestypes}
\label{sec:listofcompartments}
\label{sec:listofspecies}
\label{sec:listofparameters}
@@ -1171,217 +1160,7 @@
\ref{subsec:kinetic-law} have particularly important notes about
the usage of units in SBML.
-
%-----------------------------------------------------------------------------
-\subsection{Compartment types}
-\label{sec:compartmentType}
-%-----------------------------------------------------------------------------
-
-A \emph{compartment type} in SBML is a grouping construct used to
-establish a relationship between multiple \emph{compartments}
-(Section~\ref{sec:compartments}). A compartment type is
-represented by the \CompartmentType object class,
-\begin{wrapfigure}[14]{r}{2.5in}
- \centering
- \small
- \begin{tikzpicture}
- \node[above=0.45in] (a) {
- \emptyClassbox{\textsl{SBase}}
- };
- \node (b) {
- \begin{classbox}{CompartmentType}
- id: SId \\
- name: string \{ use="optional" \} \\
- \end{classbox}
- };
- \draw[open triangle 60-] (a) -- (b);
- \end{tikzpicture}
- \caption{The definition of class \CompartmentType. A
- sequence of one or more instances of \CompartmentType
- objects can be located in an instance of
- \ListOfCompartmentTypes in \Model, as shown in
- Figure~\protect\ref{fig:model}.}
- \label{fig:compartmentType}
-\end{wrapfigure}
-defined in Figure~\vref{fig:compartmentType}.
-
-In \sbmltwothree \changed{and beyond}, a compartment type only has an
-identity, and this identity can only be used to indicate that
-particular compartments belong to this type. This may be useful
-for conveying a modeling intention, such as when a model contains
-many similar compartments, either by their biological function or
-the reactions they carry; without a compartment type construct, it
-would be impossible in the language of SBML to indicate that all
-of the compartments share an underlying conceptual relationship
-because each SBML compartment must be given a unique and separate
-identity. Compartment types have no mathematical meaning in
-SBML \thisLV---they have no effect on a model's
-mathematical interpretation. Simulators and other numerical
-analysis software may ignore \CompartmentType objects and
-references to them in a model.
-
-There is no mechanism in SBML for representing hierarchies of
-compartment types. One \CompartmentType object instance cannot be the
-subtype of another \CompartmentType object; SBML provides no
-means of defining such relationships.
-
-
-\subsubsection{The \token{id} and \token{name} attributes}
-
-As with other major class of objects in SBML, \CompartmentType has a
-mandatory attribute, \token{id}, used to give the compartment type an
-identifier. The identifier must be a text string conforming to
-the syntax permitted by the \primtype{SId} data type described in
-Section~\ref{sec:sid}. \CompartmentType also has an optional
-\token{name} attribute, of type \primtype{string}. The \token{name}
-and \token{id} attributes must be used as described in
-Section~\ref{sec:idnameattribs}.
-
-
-\subsubsection{The \token{sboTerm} attribute}
-\label{sec:compartmenttype-sboterm}
-
-\CompartmentType inherits an optional \token{sboTerm}
-attribute of type \primtype{SBOTerm} from its parent
-class \SBase (see Sections~\ref{sec:sboterm-type}
-and~\ref{sec:sboTerm}). When a value is given to this
-attribute in a \CompartmentType instance, the value \changed{should}
-be an SBO identifier referring to a \changed{material entity} (\ie
-terms derived from \changed{\sbomaterialentity}). The relationship is
-of the form ``the compartment type \emph{is a} X'', where X is the
-SBO term. The term chosen should be the most precise (narrow) one
-that captures the role of the compartment type in the model.
-
-
-\subsubsection{Examples}
-
-The following partial SBML example illustrates a compartment type
-used to relate together many individual compartments in a
-hypothetical model.
-
-\begin{example}
-<model>
- ...
- <listOfCompartmentTypes>
- <compartmentType id="mitochondria"/>
- </listOfCompartmentTypes>
- <listOfCompartments>
- <compartment id="m1" size="0.013" compartmentType="mitochondria" outside="cell"/>
- <compartment id="m2" size="0.013" compartmentType="mitochondria" outside="cell"/>
- <compartment id="m3" size="0.013" compartmentType="mitochondria" outside="cell"/>
- <compartment id="cell" size="190.0"/>
- </listOfCompartments>
- ...
-</model>
-\end{example}
-
-
-
-%-----------------------------------------------------------------------------
-\subsection{Species types}
-\label{sec:speciesType}
-%-----------------------------------------------------------------------------
-
-The term \emph{species type} refers to reacting entities
-independent of location. These include simple ions (e.g.,
-protons, calcium), simple molecules (e.g., glucose, ATP), large
-molecules (e.g., RNA, polysaccharides, and
-\begin{wrapfigure}[15]{r}{2.55in}
- \centering
- \small
- \begin{tikzpicture}
- \node[above=0.45in] (a) {
- \emptyClassbox{\textsl{SBase}}
- };
- \node (b) {
- \begin{classbox}{SpeciesType}
- id: SId \\
- name: string \{ use="optional" \} \\
- \end{classbox}
- };
- \draw[open triangle 60-] (a) -- (b);
- \end{tikzpicture}
- \caption{The definition of class \SpeciesType. A
- sequence of one or more instances of \SpeciesType objects
- can be located in an instance of \ListOfSpeciesTypes in
- \Model, as shown in Figure~\protect\ref{fig:model}.}
- \label{fig:speciesType}
-\end{wrapfigure}
-proteins), and others. The \SpeciesType object class is
-intended to represent these entities. Its definition is shown in
-Figure~\vref{fig:speciesType}.
-
-\SpeciesType objects are included in SBML to enable \Species
-(Section~\ref{sec:species}) of the same type to be related
-together. It is a conceptual construct; the existence of
-\SpeciesType objects in a model has no effect on the model's
-numerical interpretation. Except for the requirement for
-uniqueness of species/species type combinations located in
-compartments (described in
-Section~\ref{sec:species-species-type}), simulators and other
-numerical analysis software may ignore \SpeciesType structures and
-references to them in a model.
-
-There is no mechanism in SBML for representing hierarchies of
-species types. One \SpeciesType object instance cannot be the subtype
-of another \SpeciesType; SBML provides no means of
-defining such relationships.
-
-%An example of a model that is encoded using \SpeciesType
-%structures is shown in Section~\ref{sec:speciesType-eg}.
-
-\subsubsection{The \token{id} and \token{name} attributes}
-
-As with other major object classes in SBML, \SpeciesType has a
-mandatory attribute, \token{id}, used to give the species type an
-identifier. The identifier must be a text string conforming to
-the syntax permitted by the \primtype{SId} data type described in
-Section~\ref{sec:sid}. \SpeciesType also has an optional
-\token{name} attribute, of type \primtype{string}. The \token{name}
-and \token{id} attributes must be used as described in
-Section~\ref{sec:idnameattribs}.
-
-
-\subsubsection{The \token{sboTerm} attribute}
-\label{sec:speciestype-sboterm}
-
-\SpeciesType inherits an optional \token{sboTerm}
-attribute of type \primtype{SBOTerm} from its parent
-class \SBase (see Sections~\ref{sec:sboterm-type}
-and~\ref{sec:sboTerm}). When a value is given to this
-attribute in a \SpeciesType instance, the value \changed{should}
-be an SBO identifier referring to a \changed{material entity} (\ie
-terms derived from \changed{\sbomaterialentity}). The relationship is
-of the form ``the species type \emph{is a} X'', where X is the
-SBO term. The term chosen should be the most precise (narrow) one
-that captures the role of the \changed{species} type in the model.
-
-
-\subsubsection{Example}
-
-The following XML fragment is an example of two
-\SpeciesType objects embedded in an SBML model.
-
-\begin{example}
-<model>
- ...
- <listOfSpeciesTypes>
- <speciesType id="ATP"/>
- </listOfSpeciesTypes>
- <listOfCompartments>
- <compartment id="cytosol"/>
- <compartment id="mitochon"/>
- </listOfCopartments>
- <listOfSpecies>
- <species id="ATPc" speciesType="ATP" compartment="cytosol" initialConcentration="1"/>
- <species id="ATPm" speciesType="ATP" compartment="mitochon" initialConcentration="2"/>
- </listOfSpecies>
- ...
-</model>
-\end{example}
-
-
-%-----------------------------------------------------------------------------
\subsection{Compartments}
\label{sec:compartments}
%-----------------------------------------------------------------------------
@@ -1404,7 +1183,6 @@
\begin{classbox}{Compartment}
id: SId \\
name: string \{ use="optional" \} \\
- compartmentType: SId \{ use="optional" \} \\
spatialDimensions: int \{ maxInclusive="3" minInclusive="0" use="optional" default="3" \} \\
size: double \{ use="optional" \} \\
units: UnitSId \{ use="optional" \} \\
@@ -1440,26 +1218,7 @@
to the guidelines described in Section~\ref{sec:idnameattribs}.
-\subsubsection{The \token{compartmentType} attribute}
-\label{sec:compartment-compartment-type}
-Each compartment in a model may optionally be designated as
-belonging to a particular compartment type. The optional attribute
-\token{compartmentType} of type \primtype{SId} is used identify
-the compartment type represented by the \Compartment object.
-The \token{compartmentType} attribute's value must be the identifier
-of a \CompartmentType instance defined in the model. If the
-\token{compartmentType} attribute is not present on a particular
-compartment definition, a unique virtual compartment type is
-assumed for that compartment, and no other compartment can belong
-to that compartment type.
-
-\changed{}The values of \token{compartmentType} attributes on compartments
-have no effect on the numerical interpretation of a model.
-Simulators and other numerical analysis software may ignore
-\token{compartmentType} attributes.
-
-
\subsubsection{The \token{spatialDimensions} attribute}
A \Compartment object has an optional attribute
@@ -1798,8 +1557,7 @@
is intended to represent these pools. Its definition is
shown in Figure~\vref{fig:species}. Although the exact definition
of \Species given here has changed from the definition in the
-specification of SBML Level~2 Version~1 (\ie through the
-introduction of \SpeciesType), the concept represented by \Species
+specification of SBML Level~2 Version~1, the concept represented by \Species
remains the same.
\begin{figure}[htb]
@@ -1814,7 +1572,6 @@
\begin{classbox}{Species}
id: SId \\
name: string \{ use="optional" \} \\
- speciesType: SId \{ use="optional" \} \\
compartment: SId \\
initialAmount: double \{ use="optional" \} \\
initialConcentration: double \{ use="optional" \} \\
@@ -1877,39 +1634,6 @@
-\subsubsection{The \token{speciesType} attribute}
-\label{sec:species-species-type}
-
-Each species in a model may optionally be designated as belonging
-to a particular species type. The optional attribute
-\token{speciesType} of type \primtype{SId} is used to identify the
-species type of the chemical entities that make up the pool
-represented by the \Species object. The attribute's value must be
-the identifier of an existing \SpeciesType object. If the
-\token{speciesType} attribute is not present on a particular species
-definition, it means the pool contains chemical entities of a type
-unique to that pool; in effect, a virtual species type is assumed
-for that species, and no other species can belong to that species
-type.
-
-There can be only one species of a given species type in any given
-compartment of a model. More specifically, for all \Species
-objects having a value for the \token{speciesType} attribute, the
-pair
-\begin{center}
-(\token{speciesType} attribute value, \token{compartment} attribute value)
-\end{center}
-must be unique across the set of all \Species objects
-in a model.
-
-The value of \token{speciesType} attributes on species have no
-effect on the numerical interpretation of a model. Simulators and
-other numerical analysis software may ignore \token{speciesType}
-attributes.
-
-
-
-
\subsubsection{The \token{compartment} attribute}
\label{sec:species-compartment}
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/config.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/config.tex 2009-03-25 16:37:02 UTC (rev 9427)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/config.tex 2009-03-25 23:33:35 UTC (rev 9428)
@@ -36,12 +36,8 @@
\newcommand{\ListOfUnits}{\defRef{ListOfUnits}{sec:listofunits}}
\newcommand{\FunctionDefinition}{\defRef{FunctionDefinition}{sec:functiondefinition}}
\newcommand{\ListOfFunctionDefinitions}{\defRef{ListOfFunctionDefinitions}{sec:listoffunctiondefinitions}}
-\newcommand{\CompartmentType}{\defRef{CompartmentType}{sec:compartmentType}}
-\newcommand{\ListOfCompartmentTypes}{\defRef{ListOfCompartmentTypes}{sec:listofcompartmenttypes}}
\newcommand{\Compartment}{\defRef{Compartment}{sec:compartments}}
\newcommand{\ListOfCompartments}{\defRef{ListOfCompartments}{sec:listofcompartments}}
-\newcommand{\SpeciesType}{\defRef{SpeciesType}{sec:speciesType}}
-\newcommand{\ListOfSpeciesTypes}{\defRef{ListOfSpeciesTypes}{sec:listofspeciestypes}}
\newcommand{\Species}{\defRef{Species}{sec:species}}
\newcommand{\ListOfSpecies}{\defRef{ListOfSpecies}{sec:listofspecies}}
\newcommand{\Parameter}{\defRef{Parameter}{sec:parameters}}
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/examples.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/examples.tex 2009-03-25 16:37:02 UTC (rev 9427)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/examples.tex 2009-03-25 23:33:35 UTC (rev 9428)
@@ -309,10 +309,7 @@
mathematical expressions elsewhere in the model. Note that the
species whose identifier is \val{X} is a boundary condition, as
indicated by the attribute \token{boundaryCondition}=\val{true} in
-its definition. The attribute \token{speciesType}=\val{Y} in the
-definitions of \val{Y1n} and \val{Y1c} indicates that these
-species are pools of the same participant, but located in
-different compartments.
+its definition.
\sbmlexample{multicomp.xml}
@@ -480,41 +477,4 @@
\sbmlexample{twodimensional.xml}
-%%-----------------------------------------------------------------------------
-%\subsection{Example Using \SpeciesType Structures}
-%\label{sec:speciesType-eg}
-%%-----------------------------------------------------------------------------
-%The following example is a model that uses \SpeciesType structures to indicate
-%that 2 pools of biochemical entities (\emph{species}) located in different compartments
-%contain the same type of entity (\emph{speciesType}).
-
-%\begin{small}
-%\tightspacing
-%\begin{verbatim}
-%<?xml version="1.0" encoding="UTF-8"?>
-%<sbml xmlns="http://www.sbml.org/sbml/level2/version2" level="2" version="2">
-%<model id="malate_aspartate_shuttle2">
-% <listOfCompartments>
-% <compartment id="Cytosol"/>
-% <compartment id="Mitochondrial_Matrix"/>
-% </listOfCompartments>
-% <listOfSpeciesTypes>
-% <speciesType id="Aspartate"/>
-% </listOfSpeciesTypes>
-% <listOfSpecies>
-% <species
-% id="Aspartate_in_Cytosol"
-% speciesType="Aspartate"
-% compartment="Cytosol"/>
-% <species
-% id="Aspartate_in_Mitochondrial_Matrix"
-% speciesType="Aspartate"
-% compartment="Mitochondrial_Matrix"/>
-% </listOfSpecies>
-%</model>
-%</sbml>
-%\end{verbatim}
-%\end{small}
-
-
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/listof-illustration.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/listof-illustration.tex 2009-03-25 16:37:02 UTC (rev 9427)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/listof-illustration.tex 2009-03-25 23:33:35 UTC (rev 9428)
@@ -23,12 +23,6 @@
\>\><listOfUnitDefinitions>\\
\>\>\>\textrm{\emph{one or more}} <unitDefinition> ... </unitDefinition> \textrm{\emph{elements}} \` \sayOptional\\
\>\></listOfUnitDefinitions>\\
-\>\><listOfCompartmentTypes>\\
-\>\>\>\textrm{\emph{one or more}} <compartmentType> ... </compartmentType> \textrm{\emph{elements}} \` \sayOptional\\
-\>\></listOfCompartmentTypes>\\
-\>\><listOfSpeciesTypes>\\
-\>\>\>\textrm{\emph{one or more}} <speciesType> ... </speciesType> \textrm{\emph{elements}} \` \sayOptional\\
-\>\></listOfSpeciesTypes>\\
\>\><listOfCompartments>\\
\>\>\>\textrm{\emph{one or more}} <compartment> ... </compartment> \textrm{\emph{elements}} \` \sayOptional\\
\>\></listOfCompartments>\\
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/preliminary.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/preliminary.tex 2009-03-25 16:37:02 UTC (rev 9427)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/preliminary.tex 2009-03-25 23:33:35 UTC (rev 9428)
@@ -839,7 +839,7 @@
\begin{itemize}
\item The identifier (\ie the value of the attribute \token{id}) of
- every \FunctionDefinition, \CompartmentType, \SpeciesType,
+ every \FunctionDefinition,
\Compartment, \Species, \Parameter, \Reaction,
\SpeciesReference, \ModifierSpeciesReference, \Event, and
\Model, must be unique across the set of all such identifiers in
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/sbo.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/sbo.tex 2009-03-25 16:37:02 UTC (rev 9427)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/sbo.tex 2009-03-25 23:33:35 UTC (rev 9428)
@@ -202,7 +202,20 @@
\begin{blockChanged}
-Figure~\vref{fig:expanded-species} shows the structure for the \emph{entity} branch, which reflects the hierarchical groupings of the types of entities that can be represented by a \token{compartmentType}, a \token{compartment}, a \token{speciesType} or a \token{species}. Note that the values taken by the \token{sboTerm} attribute on those elements should refer to SBO terms belonging to the \emph{material entity} branch, so as to distinguish whether the element represents a macromolecule, a simple chemical, etc. Indeed, this information remains valid for the whole model. The term should not belong to the \emph{conceptual entity} branch, representing the function of the entity within a certain functional context. If one wants to use this information, one should refer to the SBO terms using a controlled RDF annotation instead (Section~\ref{sec:annotation-standard}), carefully choosing the qualifiers (Section~\ref{sec:qualified-dc-annotation}) to reflect the fact that a given \token{species}, for instance, can fulfill different functions within a given model (\eg EGF receptor is a receptor and an enzyme).
+Figure~\vref{fig:expanded-species} shows the structure for the \emph{entity} branch,
+which reflects the hierarchical groupings of the types of entities that can be
+represented by a \token{compartment}
+or a \token{species}. Note that the values taken by the \token{sboTerm} attribute on
+those elements should refer to SBO terms belonging to the \emph{material entity} branch,
+so as to distinguish whether the element represents a macromolecule, a simple chemical,
+etc. Indeed, this information remains valid for the whole model. The term should
+not belong to the \emph{conceptual entity} branch, representing the function of
+the entity within a certain functional context. If one wants to use this information,
+one should refer to the SBO terms using a controlled RDF annotation instead
+(Section~\ref{sec:annotation-standard}), carefully choosing the qualifiers
+(Section~\ref{sec:qualified-dc-annotation}) to reflect the fact that a given
+\token{species}, for instance, can fulfill different functions within a given model
+(\eg EGF receptor is a receptor and an enzyme).
\begin{figure}[htb]
\centering
@@ -423,8 +436,6 @@
\midrule
\Model & \changed{interaction} & \changed{\sbointeractionID} \\
\FunctionDefinition & mathematical expression & \sbomathformulaID \\
- \CompartmentType & \changed{material entity} & \changed{\sbomaterialentityID} \\
- \SpeciesType & \changed{material entity} & \changed{\sbomaterialentityID} \\
\Compartment & \changed{material entity} & \changed{\sbomaterialentityID} \\
\Species & \changed{material entity} & \changed{\sbomaterialentityID} \\
\Reaction & \changed{interaction} & \sbointeractionID \\
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10301.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10301.tex 2009-03-25 16:37:02 UTC (rev 9427)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10301.tex 2009-03-25 23:33:35 UTC (rev 9428)
@@ -1,7 +1,7 @@
The value of the \token{id} attribute on every instance of the
following classes of objects in a model must be unique
across the set of all \token{id} values in a model: \Model,
-\FunctionDefinition, \CompartmentType, \SpeciesType,
+\FunctionDefinition,
\Compartment, \Species, \Reaction, \SpeciesReference,
\ModifierSpeciesReference, \Event, and model-wide \Parameter{}s.
Exception: the identifiers of instances of \UnitDefinition, and parameters defined
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10714.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10714.tex 2009-03-25 16:37:02 UTC (rev 9427)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10714.tex 2009-03-25 23:33:35 UTC (rev 9428)
@@ -1,4 +1,5 @@
-The value of the \token{sboTerm} attribute on a \CompartmentType \changed{should} be an SBO
-identifier referring to a \changed{material entity}. That is, the value
-\changed{should} be a term derived from \changed{\sbomaterialentity}. (References:
-L2V3 Section~5; L2V4 Section~\ref{sec:sbo}.)
+%FTB: This validation rule should go as well
+%The value of the \token{sboTerm} attribute on a \CompartmentType \changed{should} be an SBO
+%identifier referring to a \changed{material entity}. That is, the value
+%\changed{should} be a term derived from \changed{\sbomaterialentity}. (References:
+%L2V3 Section~5; L2V4 Section~\ref{sec:sbo}.)
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10715.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10715.tex 2009-03-25 16:37:02 UTC (rev 9427)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10715.tex 2009-03-25 23:33:35 UTC (rev 9428)
@@ -1,4 +1,5 @@
-The value of the \token{sboTerm} attribute on a \SpeciesType \changed{should} be an SBO
-identifier referring to a \changed{material entity}. That is, the value
-\changed{should} be a term derived from \changed{\sbomaterialentity}. (References:
-L2V3 Section~5; L2V4 Section~\ref{sec:sbo}.)
+%FTB: I guess this one should go
+%The value of the \token{sboTerm} attribute on a \SpeciesType \changed{should} be an SBO
+%identifier referring to a \changed{material entity}. That is, the value
+%\changed{should} be a term derived from \changed{\sbomaterialentity}. (References:
+%L2V3 Section~5; L2V4 Section~\ref{sec:sbo}.)
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20202.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20202.tex 2009-03-25 16:37:02 UTC (rev 9427)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20202.tex 2009-03-25 23:33:35 UTC (rev 9428)
@@ -1,8 +1,6 @@
The order of subelements within a \Model object instance must be the
following, with each element optional:
\token{listOfFunctionDefinitions}, \token{listOfUnitDefinitions},
-\token{listOfCompartmentTypes},
-\token{listOfSpeciesTypes},
\token{listOfCompartments}, \token{listOfSpecies},
\token{listOfParameters},
\token{listOfInitialAssignments},
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20203.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20203.tex 2009-03-25 16:37:02 UTC (rev 9427)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20203.tex 2009-03-25 23:33:35 UTC (rev 9428)
@@ -3,8 +3,6 @@
any of the following are present in a \Model, they must not be empty:\\
\token{listOfFunctionDefinitions},
\token{listOfUnitDefinitions},
-\token{listOfCompartmentTypes},
-\token{listOfSpecies-}\\ \token{Types},
\token{listOfCompartments},
\token{listOfSpecies},
\token{listOfParameters},
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20510.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20510.tex 2009-03-25 16:37:02 UTC (rev 9427)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20510.tex 2009-03-25 23:33:35 UTC (rev 9428)
@@ -1,5 +1,6 @@
-If the \token{compartmentType} attribute is given a
-value in a \Compartment definition, it must contain the identifier
-of an existing \CompartmentType defined in the model.
-(References: L2V2 Section~4.7.2; L2V3
-Section~4.7.2; L2V4 Section~\ref{sec:compartment-compartment-type}.)
+%FTB: This validation rule should go as well
+%If the \token{compartmentType} attribute is given a
+%value in a \Compartment definition, it must contain the identifier
+%of an existing \CompartmentType defined in the model.
+%(References: L2V2 Section~4.7.2; L2V3
+%Section~4.7.2; L2V4 Section~\ref{sec:compartment-compartment-type}.)
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20612.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20612.tex 2009-03-25 16:37:02 UTC (rev 9427)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20612.tex 2009-03-25 23:33:35 UTC (rev 9428)
@@ -1,3 +1,4 @@
-The value of \token{speciesType} in a \Species definition must be the
-identifier of an existing \SpeciesType. (References: L2V2
-Section~4.8.2; L2V3 Section~4.8.2; L2V4 Section~\ref{sec:species-species-type}.)
+%FTB: No more speciesType
+%The value of \token{speciesType} in a \Species definition must be the
+%identifier of an existing \SpeciesType. (References: L2V2
+%Section~4.8.2; L2V3 Section~4.8.2; L2V4 Section~\ref{sec:species-species-type}.)
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20613.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20613.tex 2009-03-25 16:37:02 UTC (rev 9427)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/20613.tex 2009-03-25 23:33:35 UTC (rev 9428)
@@ -1,8 +1,9 @@
-There cannot be more than one species of a given \SpeciesType in the same
-compartment of a model. More formally, for any given compartment, there
-cannot be more than one \Species definition in which both of the following
-hold simultaneously: (i) the \Species' \token{compartment} value is set to
-that compartment's identifier and (ii) the \Species' \token{speciesType} is
-set the same value as the \token{speciesType} of another \Species that also
-sets its \token{compartment} to that compartment identifier. (References:
-L2V2 Section~4.8.2; L2V3 Section~4.8.2; L2V4 Section~\ref{sec:species-species-type}.)
+%FTB: This validation rule should go as well
+%There cannot be more than one species of a given \SpeciesType in the same
+%compartment of a model. More formally, for any given compartment, there
+%cannot be more than one \Species definition in which both of the following
+%hold simultaneously: (i) the \Species' \token{compartment} value is set to
+%that compartment's identifier and (ii) the \Species' \token{speciesType} is
+%set the same value as the \token{speciesType} of another \Species that also
+%sets its \token{compartment} to that compartment identifier. (References:
+%L2V2 Section~4.8.2; L2V3 Section~4.8.2; L2V4 Section~\ref{sec:species-species-type}.)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mh...@us...> - 2009-03-25 16:37:12
|
Revision: 9427
http://sbml.svn.sourceforge.net/sbml/?rev=9427&view=rev
Author: mhucka
Date: 2009-03-25 16:37:02 +0000 (Wed, 25 Mar 2009)
Log Message:
-----------
Updates to authors and other info.
Modified Paths:
--------------
trunk/specifications/sbml-level-3/version-1/core/spec/front-page.tex
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/front-page.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/front-page.tex 2009-03-25 16:33:31 UTC (rev 9426)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/front-page.tex 2009-03-25 16:37:02 UTC (rev 9427)
@@ -1,32 +1,30 @@
-% -*- TeX-master: "sbml-level-2-version-4"; fill-column: 66 -*-
+% -*- TeX-master: "sbml-level-3-version-1-core"; fill-column: 66 -*-
% $Id$
% $HeadURL$
% ----------------------------------------------------------------
-\title{Systems Biology Markup Language (SBML) Level~\sbmllevel:\\[-2pt]
- Structures and Facilities for Model Definitions}
+\title{Systems Biology Markup Language (SBML) Level~\sbmllevel{} Core}
\author{\begin{tabular}{l>{\hspace*{15pt}}r}
Michael Hucka (Chair) & \emph{California Institute of Technology, USA}\\
+Frank Bergmann & \emph{University of Washington, USA}\\
Stefan Hoops & \emph{Virginia Bioinformatics Institute, USA}\\
Sarah M. Keating & \emph{California Institute of Technology, USA}\\
-Nicolas \lenov & \emph{EMBL European Bioinformatics Institute, UK}\\
Sven Sahle & \emph{University of Heidelberg, Germany}\\
Darren J. Wilkinson & \emph{Newcastle University, UK}\\[8pt]
\end{tabular}\\
\href{mailto:sbm...@sb...}{sbm...@sb...}}
-\date{\vfill SBML \thisLV\\[5pt]\emph{\thisRelease}\\[20pt]
+\date{\vfill SBML \thisLV Core\\[5pt]\emph{\thisRelease}\\[20pt]
\sbmldate}
% Extra settings for the PDF version:
\hypersetup{
- pdftitle={Systems Biology Markup Language (SBML) Level \sbmllevel:
- Structures and Facilities for Model Definitions},
- pdfauthor={Michael Hucka, Stefan Hoops, Sarah M. Keating, Nicolas \lenov,
+ pdftitle={Systems Biology Markup Language (SBML) Level \sbmllevel Core},
+ pdfauthor={Michael Hucka, Frank Bergmann, Stefan Hoops, Sarah M. Keating,
Sven Sahle, and Darren J. Wilkinson},
- pdfsubject={SBML \thisLVR}
+ pdfsubject={SBML \thisLVR Core}
}
\maketitle
@@ -37,16 +35,16 @@
Corrections and other changes to this SBML language specification may appear over time.\\
Notifications of new releases are broadcast on the mailing list \href{http://www.sbml.org/forums}{sbm...@sb...}\\[10pt]
-The latest release of the SBML \thisLV specification is available at\\
-\url{http://sbml.org/specifications/sbml-level-\sbmllevel/version-\sbmlversion/}\\[10pt]
+The latest release of the SBML \thisLV Core specification is available at\\
+\url{http://sbml.org/specifications/sbml-level-\sbmllevel/version-\sbmlversion/core}\\[10pt]
\emph{This} release of the specification is available at\\
-\url{http://sbml.org/specifications/sbml-level-\sbmllevel/version-\sbmlversion/release-\sbmlreleaseNC/}\\[10pt]
+\url{http://sbml.org/specifications/sbml-level-\sbmllevel/version-\sbmlversion/core/release-\sbmlreleaseNC/}\\[10pt]
-The list of known issues in all releases of SBML \thisLV is available at\\
-\url{http://sbml.org/specifications/sbml-level-\sbmllevel/version-\sbmlversion/errata/}\\[10pt]
+The list of known issues in all releases of SBML \thisLV Core is available at\\
+\url{http://sbml.org/specifications/sbml-level-\sbmllevel/version-\sbmlversion/core/errata/}\\[10pt]
-The XML Schema for SBML \thisLV is available at\\
+The XML Schema for SBML \thisLV Core is available at\\
\url{http://sbml.org/xml-schemas/}\\[10pt]
\end{center}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mh...@us...> - 2009-03-25 16:33:40
|
Revision: 9426
http://sbml.svn.sourceforge.net/sbml/?rev=9426&view=rev
Author: mhucka
Date: 2009-03-25 16:33:31 +0000 (Wed, 25 Mar 2009)
Log Message:
-----------
Fixes for version numbers etc.
Modified Paths:
--------------
trunk/specifications/sbml-level-3/version-1/core/spec/config.tex
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/config.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/config.tex 2009-03-25 16:14:26 UTC (rev 9425)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/config.tex 2009-03-25 16:33:31 UTC (rev 9426)
@@ -1,4 +1,4 @@
-% Emacs: -*- TeX-master: "sbml-level-2-version-4"; fill-column: 66 -*-
+% Emacs: -*- TeX-master: "sbml-level-3-version-1"; fill-column: 66 -*-
% -----------------------------------------------------------------------------
% Description : Version/level-specific LaTeX definitions & helpers
% Original author(s): Michael Hucka <mh...@ca...>
@@ -9,18 +9,18 @@
% Which level/version/release is this?
-\newcommand{\sbmllevel} {2}
-\newcommand{\sbmlversion} {4}
+\newcommand{\sbmllevel} {3}
+\newcommand{\sbmlversion} {1}
\newcommand{\sbmlrelease} {1}
\newcommand{\sbmlreleaseNC}{1}
-\newcommand{\sbmldate} {\textcolor{\changedColor}{22 December 2008}}
+\newcommand{\sbmldate} {\fbox{DRAFT \today}}
-\newcommand{\thisRelease} {Release~\changed{\sbmlrelease{}}\xspace}
-\newcommand{\thisV} {\changed{Version~\sbmlversion}}
-\newcommand{\thisLV} {Level~\sbmllevel{} Version~\changed{\sbmlversion{}}\xspace}
+\newcommand{\thisRelease} {Release~\sbmlrelease{}\xspace}
+\newcommand{\thisV} {Version~\sbmlversion}
+\newcommand{\thisLV} {Level~\sbmllevel{} Version~\sbmlversion{}\xspace}
\newcommand{\thisLVR} {\thisLV \thisRelease}
-\newcommand{\previousLVR} {Level~2 Version~3 Release~2}
+\newcommand{\previousLVR} {Level~2 Version~4 Release~1}
% Special commands for linking the SBML component classes in this document.
% The following defines a special command of the form \Foo for any SBML
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mh...@us...> - 2009-03-25 16:14:35
|
Revision: 9425
http://sbml.svn.sourceforge.net/sbml/?rev=9425&view=rev
Author: mhucka
Date: 2009-03-25 16:14:26 +0000 (Wed, 25 Mar 2009)
Log Message:
-----------
Renamed for new L3 core V1.
Added Paths:
-----------
trunk/specifications/sbml-level-3/version-1/core/spec/sbml-level-3-version-1-core.tex
Removed Paths:
-------------
trunk/specifications/sbml-level-3/version-1/core/spec/sbml-level-2-version-4.tex
Deleted: trunk/specifications/sbml-level-3/version-1/core/spec/sbml-level-2-version-4.tex
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/sbml-level-2-version-4.tex 2009-03-25 16:14:04 UTC (rev 9424)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/sbml-level-2-version-4.tex 2009-03-25 16:14:26 UTC (rev 9425)
@@ -1,71 +0,0 @@
-% -*- TeX-master: "sbml-level-2-version-4"; fill-column: 66 -*-
-% ----------------------------------------------------------------
-% Description : Top-level file for SBML L2V3R1 specification
-% Original author(s): Michael Hucka <mh...@ca...>
-% Organization : California Institute of Technology
-% $Id$
-% $HeadURL$
-% ----------------------------------------------------------------
-
-\documentclass{sbmlspec}
-
-\input{config} % Things that often change with each release.
-
-% ----------------------------------------------------------------
-\begin{document}
-% ----------------------------------------------------------------
-
-% Front matter:
-
-\input{front-page}
-\clearpage
-\sbmltableofcontents
-\clearpage
-
-% Body:
-
-\color{black} % PDF page coloring is buggy. Set it straight.
-\linenumbers
-
-\input{intro}
-\input{overview}
-\input{preliminary}
-\input{components}
-\input{sbo}
-\input{annotations}
-\input{examples}
-\input{discussion}
-
-\setcounter{secnumdepth}{-1}
-\input{acknowledgments}
-
-% Appendices:
-
-\clearpage
-\setcounter{secnumdepth}{2}
-\appendix
-\input{apdx-schema}
-\input{apdx-mathml-schema}
-\input{apdx-validation}
-\input{apdx-overdetermined}
-\input{apdx-fast}
-\input{apdx-processing-notes}
-\input{apdx-changes}
-
-% 2008-07-25 <mh...@ca...>
-% This next file is not used in the Release 1 document because it's
-% a history of changes between releases within a version/level.
-% This will become relevant in future releases of L2v4.
-%
-% \input{apdx-release-history}
-
-% References:
-
-\clearpage
-\bibliographystyle{apalike}
-\bibliography{strings,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z}
-
-
-% ----------------------------------------------------------------
-\end{document}
-% ----------------------------------------------------------------
Copied: trunk/specifications/sbml-level-3/version-1/core/spec/sbml-level-3-version-1-core.tex (from rev 9423, trunk/specifications/sbml-level-3/version-1/core/spec/sbml-level-2-version-4.tex)
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/sbml-level-3-version-1-core.tex (rev 0)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/sbml-level-3-version-1-core.tex 2009-03-25 16:14:26 UTC (rev 9425)
@@ -0,0 +1,71 @@
+% -*- TeX-master: "sbml-level-2-version-4"; fill-column: 66 -*-
+% ----------------------------------------------------------------
+% Description : Top-level file for SBML L2V3R1 specification
+% Original author(s): Michael Hucka <mh...@ca...>
+% Organization : California Institute of Technology
+% $Id$
+% $HeadURL$
+% ----------------------------------------------------------------
+
+\documentclass{sbmlspec}
+
+\input{config} % Things that often change with each release.
+
+% ----------------------------------------------------------------
+\begin{document}
+% ----------------------------------------------------------------
+
+% Front matter:
+
+\input{front-page}
+\clearpage
+\sbmltableofcontents
+\clearpage
+
+% Body:
+
+\color{black} % PDF page coloring is buggy. Set it straight.
+\linenumbers
+
+\input{intro}
+\input{overview}
+\input{preliminary}
+\input{components}
+\input{sbo}
+\input{annotations}
+\input{examples}
+\input{discussion}
+
+\setcounter{secnumdepth}{-1}
+\input{acknowledgments}
+
+% Appendices:
+
+\clearpage
+\setcounter{secnumdepth}{2}
+\appendix
+\input{apdx-schema}
+\input{apdx-mathml-schema}
+\input{apdx-validation}
+\input{apdx-overdetermined}
+\input{apdx-fast}
+\input{apdx-processing-notes}
+\input{apdx-changes}
+
+% 2008-07-25 <mh...@ca...>
+% This next file is not used in the Release 1 document because it's
+% a history of changes between releases within a version/level.
+% This will become relevant in future releases of L2v4.
+%
+% \input{apdx-release-history}
+
+% References:
+
+\clearpage
+\bibliographystyle{apalike}
+\bibliography{strings,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z}
+
+
+% ----------------------------------------------------------------
+\end{document}
+% ----------------------------------------------------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mh...@us...> - 2009-03-25 16:14:15
|
Revision: 9424
http://sbml.svn.sourceforge.net/sbml/?rev=9424&view=rev
Author: mhucka
Date: 2009-03-25 16:14:04 +0000 (Wed, 25 Mar 2009)
Log Message:
-----------
Updated file name.
Modified Paths:
--------------
trunk/specifications/sbml-level-3/version-1/core/spec/Makefile
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/Makefile
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/Makefile 2009-03-25 16:08:52 UTC (rev 9423)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/Makefile 2009-03-25 16:14:04 UTC (rev 9424)
@@ -20,7 +20,7 @@
SBML_TEXINPUTS = .:$(SBML_TEX)//:$(TEXINPUTS)
SBML_BIBINPUTS = .:$(SBML_BIB)/:$(BIBINPUTS)
-MAIN_FILE = sbml-level-2-version-4
+MAIN_FILE = sbml-level-3-version-1-core
MATHML_SCHEMA = ../../../../sbml-mathml/sbml-mathml.xsd
default: pdf
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fbe...@us...> - 2009-03-25 16:09:09
|
Revision: 9423
http://sbml.svn.sourceforge.net/sbml/?rev=9423&view=rev
Author: fbergmann
Date: 2009-03-25 16:08:52 +0000 (Wed, 25 Mar 2009)
Log Message:
-----------
removed l2v4 pdf
Removed Paths:
-------------
trunk/specifications/sbml-level-3/version-1/core/spec/sbml-level-2-version-4.pdf
Deleted: trunk/specifications/sbml-level-3/version-1/core/spec/sbml-level-2-version-4.pdf
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/sbml-level-2-version-4.pdf 2009-03-25 16:08:02 UTC (rev 9422)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/sbml-level-2-version-4.pdf 2009-03-25 16:08:52 UTC (rev 9423)
@@ -1,30396 +0,0 @@
-%PDF-1.4
-5 0 obj
-<< /S /GoTo /D [6 0 R /Fit ] >>
-endobj
-9 0 obj <<
-/Length 1906
-/Filter /FlateDecode
->>
-stream
-x\xDA\xCDYKo\xDBF\xBE\xEBW\xF0H\xE5j\xDF$sJ\x9DW\x9B\xD8R\xBBi\x81$\x9A\xA6%"鐔S\xFF\xFB\xCE\xECC"\xBD\x8A\x9C\xB89\xAC\xE5rv\xE6\x9B\xF7,\xC3"
-\xFFX\x94\xF2(\x95\x9CMUTnf\xD4lw\xCB\xC8.\xFEx5c\x8EP\xEA~\x8F\x92$H\x93pIr\xAA\xF5C\xA4$Ϙ0\xD42gߐ}\x8D=n |
|
From: <fbe...@us...> - 2009-03-25 16:08:25
|
Revision: 9422
http://sbml.svn.sourceforge.net/sbml/?rev=9422&view=rev
Author: fbergmann
Date: 2009-03-25 16:08:02 +0000 (Wed, 25 Mar 2009)
Log Message:
-----------
updated makefile
Modified Paths:
--------------
trunk/specifications/sbml-level-3/version-1/core/spec/Makefile
trunk/specifications/sbml-level-3/version-1/core/spec/sbml-level-2-version-4.pdf
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/Makefile
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/Makefile 2009-03-25 15:50:56 UTC (rev 9421)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/Makefile 2009-03-25 16:08:02 UTC (rev 9422)
@@ -12,7 +12,7 @@
## more information about SBML and the latest version of the specification.
##----------------------------------------------------------------------- -->*/
-SBML_PROJECT=../../../../project
+SBML_PROJECT=../../../../../project
SBML_TEX=$(SBML_PROJECT)/tex
SBML_BIB=$(SBML_PROJECT)/bib
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/sbml-level-2-version-4.pdf
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/sbml-level-2-version-4.pdf 2009-03-25 15:50:56 UTC (rev 9421)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/sbml-level-2-version-4.pdf 2009-03-25 16:08:02 UTC (rev 9422)
@@ -1,398 +1,8 @@
%PDF-1.4
5 0 obj
-<< /S /GoTo /D (section.0.1) >>
+<< /S /GoTo /D [6 0 R /Fit ] >>
endobj
-8 0 obj
-(Introduction)
-endobj
-9 0 obj
-<< /S /GoTo /D (subsection.0.1.1) >>
-endobj
-12 0 obj
-(Developments, discussions, and notifications of updates)
-endobj
-13 0 obj
-<< /S /GoTo /D (subsection.0.1.2) >>
-endobj
-16 0 obj
-(SBML Levels, Versions, and Releases)
-endobj
-17 0 obj
-<< /S /GoTo /D (subsection.0.1.3) >>
-endobj
-20 0 obj
-(Language features and backward compatibility)
-endobj
-21 0 obj
-<< /S /GoTo /D (subsection.0.1.4) >>
-endobj
-24 0 obj
-(Document conventions)
-endobj
-25 0 obj
-<< /S /GoTo /D (section.0.2) >>
-endobj
-28 0 obj
-(Overview of SBML)
-endobj
-29 0 obj
-<< /S /GoTo /D (section.0.3) >>
-endobj
-32 0 obj
-(Preliminary definitions and principles)
-endobj
-33 0 obj
-<< /S /GoTo /D (subsection.0.3.1) >>
-endobj
-36 0 obj
-(Primitive data types)
-endobj
-37 0 obj
-<< /S /GoTo /D (subsection.0.3.2) >>
-endobj
-40 0 obj
-(Type SBase)
-endobj
-41 0 obj
-<< /S /GoTo /D (subsection.0.3.3) >>
-endobj
-44 0 obj
-(The id and name attributes on SBML components)
-endobj
-45 0 obj
-<< /S /GoTo /D (subsection.0.3.4) >>
-endobj
-48 0 obj
-(Mathematical formulas in SBML Level 2)
-endobj
-49 0 obj
-<< /S /GoTo /D (section.0.4) >>
-endobj
-52 0 obj
-(SBML components)
-endobj
-53 0 obj
-<< /S /GoTo /D (subsection.0.4.1) >>
-endobj
-56 0 obj
-(The SBML container)
-endobj
-57 0 obj
-<< /S /GoTo /D (subsection.0.4.2) >>
-endobj
-60 0 obj
-(Model)
-endobj
-61 0 obj
-<< /S /GoTo /D (subsection.0.4.3) >>
-endobj
-64 0 obj
-(Function definitions)
-endobj
-65 0 obj
-<< /S /GoTo /D (subsection.0.4.4) >>
-endobj
-68 0 obj
-(Unit definitions)
-endobj
-69 0 obj
-<< /S /GoTo /D (subsection.0.4.5) >>
-endobj
-72 0 obj
-(Compartment types)
-endobj
-73 0 obj
-<< /S /GoTo /D (subsection.0.4.6) >>
-endobj
-76 0 obj
-(Species types)
-endobj
-77 0 obj
-<< /S /GoTo /D (subsection.0.4.7) >>
-endobj
-80 0 obj
-(Compartments)
-endobj
-81 0 obj
-<< /S /GoTo /D (subsection.0.4.8) >>
-endobj
-84 0 obj
-(Species)
-endobj
-85 0 obj
-<< /S /GoTo /D (subsection.0.4.9) >>
-endobj
-88 0 obj
-(Parameters)
-endobj
-89 0 obj
-<< /S /GoTo /D (subsection.0.4.10) >>
-endobj
-92 0 obj
-(Initial assignments)
-endobj
-93 0 obj
-<< /S /GoTo /D (subsection.0.4.11) >>
-endobj
-96 0 obj
-(Rules)
-endobj
-97 0 obj
-<< /S /GoTo /D (subsection.0.4.12) >>
-endobj
-100 0 obj
-(Constraints)
-endobj
-101 0 obj
-<< /S /GoTo /D (subsection.0.4.13) >>
-endobj
-104 0 obj
-(Reactions)
-endobj
-105 0 obj
-<< /S /GoTo /D (subsection.0.4.14) >>
-endobj
-108 0 obj
-(Events)
-endobj
-109 0 obj
-<< /S /GoTo /D (section.0.5) >>
-endobj
-112 0 obj
-(The Systems Biology Ontology and the sboTerm attribute)
-endobj
-113 0 obj
-<< /S /GoTo /D (subsection.0.5.1) >>
-endobj
-116 0 obj
-(Principles)
-endobj
-117 0 obj
-<< /S /GoTo /D (subsection.0.5.2) >>
-endobj
-120 0 obj
-(Using SBO and sboTerm)
-endobj
-121 0 obj
-<< /S /GoTo /D (subsection.0.5.3) >>
-endobj
-124 0 obj
-(Relationships to the SBML annotation element)
-endobj
-125 0 obj
-<< /S /GoTo /D (subsection.0.5.4) >>
-endobj
-128 0 obj
-(Discussion)
-endobj
-129 0 obj
-<< /S /GoTo /D (section.0.6) >>
-endobj
-132 0 obj
-(A standard format for the annotation element)
-endobj
-133 0 obj
-<< /S /GoTo /D (subsection.0.6.1) >>
-endobj
-136 0 obj
-(Motivation)
-endobj
-137 0 obj
-<< /S /GoTo /D (subsection.0.6.2) >>
-endobj
-140 0 obj
-(XML namespaces in the standard annotation)
-endobj
-141 0 obj
-<< /S /GoTo /D (subsection.0.6.3) >>
-endobj
-144 0 obj
-(General syntax for the standard annotation)
-endobj
-145 0 obj
-<< /S /GoTo /D (subsection.0.6.4) >>
-endobj
-148 0 obj
-(Use of URIs)
-endobj
-149 0 obj
-<< /S /GoTo /D (subsection.0.6.5) >>
-endobj
-152 0 obj
-(Relation elements)
-endobj
-153 0 obj
-<< /S /GoTo /D (subsection.0.6.6) >>
-endobj
-156 0 obj
-(Model history)
-endobj
-157 0 obj
-<< /S /GoTo /D (subsection.0.6.7) >>
-endobj
-160 0 obj
-(Examples)
-endobj
-161 0 obj
-<< /S /GoTo /D (section.0.7) >>
-endobj
-164 0 obj
-(Example models expressed in XML using SBML)
-endobj
-165 0 obj
-<< /S /GoTo /D (subsection.0.7.1) >>
-endobj
-168 0 obj
-(A simple example application of SBML)
-endobj
-169 0 obj
-<< /S /GoTo /D (subsection.0.7.2) >>
-endobj
-172 0 obj
-(Example involving units)
-endobj
-173 0 obj
-<< /S /GoTo /D (subsection.0.7.3) >>
-endobj
-176 0 obj
-(Example of a discrete version of a simple dimerization reaction)
-endobj
-177 0 obj
-<< /S /GoTo /D (subsection.0.7.4) >>
-endobj
-180 0 obj
-(Example involving assignment rules)
-endobj
-181 0 obj
-<< /S /GoTo /D (subsection.0.7.5) >>
-endobj
-184 0 obj
-(Example involving algebraic rules)
-endobj
-185 0 obj
-<< /S /GoTo /D (subsection.0.7.6) >>
-endobj
-188 0 obj
-(Example with combinations of boundaryCondition and constant values on Species with RateRule objects)
-endobj
-189 0 obj
-<< /S /GoTo /D (subsection.0.7.7) >>
-endobj
-192 0 obj
-(Example of translation from a multi-compartmental model to ODEs)
-endobj
-193 0 obj
-<< /S /GoTo /D (subsection.0.7.8) >>
-endobj
-196 0 obj
-(Example involving function definitions)
-endobj
-197 0 obj
-<< /S /GoTo /D (subsection.0.7.9) >>
-endobj
-200 0 obj
-(Example involving delay functions)
-endobj
-201 0 obj
-<< /S /GoTo /D (subsection.0.7.10) >>
-endobj
-204 0 obj
-(Example involving events)
-endobj
-205 0 obj
-<< /S /GoTo /D (subsection.0.7.11) >>
-endobj
-208 0 obj
-(Example involving two-dimensional compartments)
-endobj
-209 0 obj
-<< /S /GoTo /D (section.0.8) >>
-endobj
-212 0 obj
-(Discussion)
-endobj
-213 0 obj
-<< /S /GoTo /D (subsection.0.8.1) >>
-endobj
-216 0 obj
-(Future enhancements: SBML Level 3 and beyond)
-endobj
-217 0 obj
-<< /S /GoTo /D (section*.57) >>
-endobj
-220 0 obj
-(Acknowledgments)
-endobj
-221 0 obj
-<< /S /GoTo /D (section.A) >>
-endobj
-224 0 obj
-(XML Schema for SBML)
-endobj
-225 0 obj
-<< /S /GoTo /D (section.B) >>
-endobj
-228 0 obj
-(XML Schema for MathML subset)
-endobj
-229 0 obj
-<< /S /GoTo /D (section.C) >>
-endobj
-232 0 obj
-(Validation rules for SBML)
-endobj
-233 0 obj
-<< /S /GoTo /D (section.D) >>
-endobj
-236 0 obj
-(A method for assessing whether an SBML model is overdetermined)
-endobj
-237 0 obj
-<< /S /GoTo /D (section.E) >>
-endobj
-240 0 obj
-(Mathematical consequences of the fast attribute on Reaction)
-endobj
-241 0 obj
-<< /S /GoTo /D (section.F) >>
-endobj
-244 0 obj
-(Processing and validating SBase notes and Constraint message content)
-endobj
-245 0 obj
-<< /S /GoTo /D (section.G) >>
-endobj
-248 0 obj
-(Major changes between versions of SBML Level 2 and implications for backward compatibility)
-endobj
-249 0 obj
-<< /S /GoTo /D (subsection.G.1) >>
-endobj
-252 0 obj
-(Between Version 2 and Version 1)
-endobj
-253 0 obj
-<< /S /GoTo /D (subsection.G.2) >>
-endobj
-256 0 obj
-(Between Version 3 and Version 2)
-endobj
-257 0 obj
-<< /S /GoTo /D (subsection.G.3) >>
-endobj
-260 0 obj
-(Between Version 4 and Version 3)
-endobj
-261 0 obj
-<< /S /GoTo /D (subsection.G.3) >>
-endobj
-263 0 obj
-(References)
-endobj
-264 0 obj
-<< /S /GoTo /D [265 0 R /Fit ] >>
-endobj
-268 0 obj <<
+9 0 obj <<
/Length 1906
/Filter /FlateDecode
>>
@@ -415,15 +25,15 @@
\xEAZ\xF9\x9E\xEF\xB8t\xE2\xEB\xFD\xEEK\xA7\xC4\xD2)\xF7\xF7S[A\xC3\xF2)'9\xDCd\xF7\x9A=\>wg\x92\xF1\xA1\xC0h!\xEB\x83\xE5S\xB2l\x9B\xEA)\x82#.\xF3\xF4Hr\xBCN\xA4?\xAA:J\xD9\xC0)\xC9R=6w\x97d\xCC\xE6P\xEEܗ\xF6\xD3r\xA7\xEA\xBAb(\x81\x8B\xCF`\x98\xE8w죬\xA35\x99\xE4L
d\x8A\x81\xFB\xB5&\x94\xA7\xF7r\xE6ﳹ\xBDH\xE2$`F7\xFCD\xE7\xC3~S\xD8XƯA\xC4\xFF\x87a!eD3\xC5\xF6\x98\xBEcX\xF0g\x92\xF1\xA1\xB0]\xAC\xA9&*\xD7j\x8A\xE0Ȱ\xE0\xE9\x92k\xA3\xCAD\xFAc\xA2\x9DI\x84RYĔ$4\xE5\x8F\xFC\xE2\xB9$c6a\xB4\x87\xD2E\xFB?>\xBA\xFBrUm\x8A~ZG$ɧ\xA0\x8F\xDC\xD04\xB3\xF4I&\xC1k\x99\x99\xC0\xA2/\xA0T\xE7\xF6\xC4hm\xBE[+\x8CyÀ2\xE5\xB7\xBFoX\x{13C77D}\x9BE\xEF\xC6Ɏ\xB3efI\xF3G\xFF/ȿj\xA7\xBAaendstream
endobj
-265 0 obj <<
+6 0 obj <<
/Type /Page
-/Contents 268 0 R
-/Resources 267 0 R
+/Contents 9 0 R
+/Resources 8 0 R
/MediaBox [0 0 612 792]
-/Parent 295 0 R
-/Annots [ 280 0 R 284 0 R 285 0 R 292 0 R 293 0 R 294 0 R ]
+/Parent 36 0 R
+/Annots [ 21 0 R 25 0 R 26 0 R 33 0 R 34 0 R 35 0 R ]
>> endobj
-266 0 obj <<
+7 0 obj <<
/Type /XObject
/Subtype /Image
/Width 5866
@@ -1982,2192 +1592,1013 @@
\xAD\xEE\xCF\xC8nӛa#Y\x8B\\x94_\xA6;'\x92\xAF4\xEB=@<\x9F\x82\xC5\xE5ت\xF0\xB8\xDC5\xEC6"\x89ҫW\xA8\x9A*\xA7\xB6'\x94 |
|
From: <mh...@us...> - 2009-03-25 15:51:21
|
Revision: 9421
http://sbml.svn.sourceforge.net/sbml/?rev=9421&view=rev
Author: mhucka
Date: 2009-03-25 15:50:56 +0000 (Wed, 25 Mar 2009)
Log Message:
-----------
Fixed path in makefile.
Modified Paths:
--------------
trunk/specifications/sbml-level-3/version-1/core/spec/Makefile
trunk/specifications/sbml-level-3/version-1/core/spec/sbml-level-2-version-4.pdf
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/Makefile
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/Makefile 2009-03-25 15:48:40 UTC (rev 9420)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/Makefile 2009-03-25 15:50:56 UTC (rev 9421)
@@ -21,7 +21,7 @@
SBML_BIBINPUTS = .:$(SBML_BIB)/:$(BIBINPUTS)
MAIN_FILE = sbml-level-2-version-4
-MATHML_SCHEMA = ../../../sbml-mathml/sbml-mathml.xsd
+MATHML_SCHEMA = ../../../../sbml-mathml/sbml-mathml.xsd
default: pdf
Modified: trunk/specifications/sbml-level-3/version-1/core/spec/sbml-level-2-version-4.pdf
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/sbml-level-2-version-4.pdf 2009-03-25 15:48:40 UTC (rev 9420)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/sbml-level-2-version-4.pdf 2009-03-25 15:50:56 UTC (rev 9421)
@@ -24843,43 +24843,44 @@
/ProcSet [ /PDF /Text ]
>> endobj
2859 0 obj <<
-/Length 4549
+/Length 4556
/Filter /FlateDecode
>>
stream
-xڵ\m\x8Fܶ\xFE\x9E_q=\xC8^\x91副\x92ܺE\x9C\xC4M
-;\xE2K[4
-yWw'xW\xBAH\xDA;\xBBȏ\xEF\xF0M\xA2\xB4\xE4.k\xABi\xA5\xD1<\xCF<\x92CJ>|\x91\xC0\xF8"%)#\x88\x8A\x84_l\xF6\x9F%\xEAr{w\xA1O~\xFC\xCBg\xD82\x91\xC1\xF1\xA4ɚ\xB3\xE4b\xED\xBA{q\xF3\xD9\xF5K\xCE.0A,\xC3\xF8\xE2\xE6V&)b9&7۟W_]\xADq\x92$\xAB\xBC~u\xB5&i\xB6z\xB3\xB9\xC2\xC9\xEA\xBE\xDC\xFA\xF7\xEDIVMkn\xBE |
|
From: <mh...@us...> - 2009-03-25 15:48:55
|
Revision: 9420
http://sbml.svn.sourceforge.net/sbml/?rev=9420&view=rev
Author: mhucka
Date: 2009-03-25 15:48:40 +0000 (Wed, 25 Mar 2009)
Log Message:
-----------
Adding schema from L2v4 as a starting point.
Added Paths:
-----------
trunk/specifications/sbml-level-3/version-1/core/schema/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mh...@us...> - 2009-03-25 15:36:07
|
Revision: 9419
http://sbml.svn.sourceforge.net/sbml/?rev=9419&view=rev
Author: mhucka
Date: 2009-03-25 15:35:55 +0000 (Wed, 25 Mar 2009)
Log Message:
-----------
Check in files from L2v4 as a starting point.
Added Paths:
-----------
trunk/specifications/sbml-level-3/version-1/core/spec/
trunk/specifications/sbml-level-3/version-1/core/spec/annotations.tex
trunk/specifications/sbml-level-3/version-1/core/spec/apdx-changes.tex
trunk/specifications/sbml-level-3/version-1/core/spec/apdx-schema.tex
trunk/specifications/sbml-level-3/version-1/core/spec/components.tex
trunk/specifications/sbml-level-3/version-1/core/spec/config.tex
trunk/specifications/sbml-level-3/version-1/core/spec/figs/sbo-top-level.eps
trunk/specifications/sbml-level-3/version-1/core/spec/figs/sbo-top-level.graffle
trunk/specifications/sbml-level-3/version-1/core/spec/figs/sbo-top-level.pdf
trunk/specifications/sbml-level-3/version-1/core/spec/figs/sbo-top-level.svg
trunk/specifications/sbml-level-3/version-1/core/spec/preliminary.tex
trunk/specifications/sbml-level-3/version-1/core/spec/sbml-level-2-version-4.pdf
trunk/specifications/sbml-level-3/version-1/core/spec/sbo.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10701.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10702.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10703.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10704.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10705.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10706.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10707.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10708.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10709.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10710.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10711.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10712.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10713.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10714.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10715.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10716.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10717.tex
Removed Paths:
-------------
trunk/specifications/sbml-level-3/version-1/core/spec/annotations.tex
trunk/specifications/sbml-level-3/version-1/core/spec/apdx-changes.tex
trunk/specifications/sbml-level-3/version-1/core/spec/apdx-schema.tex
trunk/specifications/sbml-level-3/version-1/core/spec/components.tex
trunk/specifications/sbml-level-3/version-1/core/spec/config.tex
trunk/specifications/sbml-level-3/version-1/core/spec/figs/sbo-top-level.eps
trunk/specifications/sbml-level-3/version-1/core/spec/figs/sbo-top-level.graffle
trunk/specifications/sbml-level-3/version-1/core/spec/figs/sbo-top-level.pdf
trunk/specifications/sbml-level-3/version-1/core/spec/figs/sbo-top-level.svg
trunk/specifications/sbml-level-3/version-1/core/spec/preliminary.tex
trunk/specifications/sbml-level-3/version-1/core/spec/sbml-level-2-version-4.pdf
trunk/specifications/sbml-level-3/version-1/core/spec/sbo.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10701.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10702.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10703.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10704.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10705.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10706.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10707.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10708.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10709.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10710.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10711.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10712.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10713.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10714.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10715.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10716.tex
trunk/specifications/sbml-level-3/version-1/core/spec/validation-rules/10717.tex
Deleted: trunk/specifications/sbml-level-3/version-1/core/spec/annotations.tex
===================================================================
--- trunk/specifications/sbml-level-2/version-4/spec/annotations.tex 2008-12-17 21:16:13 UTC (rev 8611)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/annotations.tex 2009-03-25 15:35:55 UTC (rev 9419)
@@ -1,932 +0,0 @@
-% -*- TeX-master: "sbml-level-2-version-4"; fill-column: 66 -*-
-% $Id$
-% $HeadURL$
-% ----------------------------------------------------------------
-
-\section{A standard format for the \token{annotation} element}
-\label{sec:finney-novere}
-\label{sec:annotation-standard}
-
-This section describes the recommended non-proprietary
-format for the content of \token{annotation} elements
-in SBML when (a) referring to controlled vocabulary
-terms and database identifiers which define and describe
-biological and biochemical entities, and (b) describing the
-creator of a model and its modification history. Such a structured
-format should facilitate the generation of models compliant with
-the MIRIAM guidelines for model curation~\citep{le_novere:2005}.
-
-The format described in this section is intended to be the form of
-one of the top-level elements that could reside in an
-\token{annotation} element attached to an SBML object derived from
-\SBase. The element is named \token{rdf:RDF}. The format
-described here is compliant with the constraints placed on the
-form of annotation elements described in
-Section~\ref{sec:annotation-use}. We refer readers to
-Section~\ref{sec:annotation-use} for important information on the
-structure and organization of application-specific annotations;
-these are not described here.
-
-
-\subsection{Motivation}
-
-The SBML structures described elsewhere in this document do not
-have any biochemical or biological semantics. The format
-described in this section provides a scheme for linking SBML
-structures to external resources so that those structures can have
-such semantics. The motivation for the introduction of this
-scheme is similar to that given for the introduction of
-\token{sboTerm}; however, this scheme is significantly more
-flexible.
-
-\begin{blockChanged}
-
-It is generally not recommended that this format be used to refer
-to SBO terms. In most cases, the SBO terms should be referred to
-using the attribute \token{sboTerm} part of \token{SBase}
-(Section~\ref{sec:sboTerm}). However in certain situations, for instance
-to be able to add further information about the functional role of a
-species, it is necessary to add this additional information using the
-annotation format described here.
-
-\end{blockChanged}
-
-\subsection{XML namespaces in the standard annotation}
-
-This format uses a restricted form of Dublin
-Core~\citep{DCMI:2003} and BioModels qualifier elements (see
-\url{http://www.ebi.ac.uk/compneur-srv/miriam-main/mdb?section=qualifiers}) embedded in
-RDF~\citep{w3c:2004}. It uses a number of external XML standards
-and associated XML namespaces.
-Table~\ref{tab:namespaces-for-standard-annotation} lists these
-namespaces and relevant documentation on those namespaces. The
-format constrains the order of elements in these namespaces beyond
-the constraints defined in the standard definitions for those
-namespaces. For each standard listed, the format only uses a
-subset of the possible syntax defined by the given standard. Thus
-it is possible for an \token{annotation} element to include XML
-that is compliant with those external standards but is not
-compliant with the format described here. Parsers wishing to
-support this format should be aware that a valid
-\token{annotation} element may contain an \token{rdf:RDF} element
-which is not compliant with the format described here. A parser
-should check that all aspects of the syntax defined here before
-assuming that the contained data is encoded in the format.
-
-\begin{table}[bh]
- \vspace*{3ex}
- \small
- \centering
- \begin{edtable}{tabular}{lll}
- \toprule
-& Namespace URI & Definition Document \\
- \midrule
- \token{dc} & \uri{http://purl.org/dc/elements/1.1/} & \cite{powell:2003}\\
- \token{rdf} & \uri{http://www.w3.org/1999/02/22-rdf-syntax-ns\#} & \cite{w3c:2004b} \\
- \token{dcterms} & \uri{http://purl.org/dc/terms/} & \cite{kokkelink:2002}\\
- & & \cite{DCMIUB:2005} \\
- \token{vcard} & \uri{http://www.w3.org/2001/vcard-rdf/3.0\#} & \cite{iannella:2001} \\
- \token {bqbiol} & \uri{http://biomodels.net/biology-qualifiers/} \\
- \token {bqmodel} & \uri{http://biomodels.net/model-qualifiers/} \\
- \bottomrule
- \end{edtable}
- \vspace*{-0.95ex}
- \caption{The XML standards used in the SBML standard format for annotation.
- The namespace prefix are shown to indicate only the prefix used in the main text.}
- \label{tab:namespaces-for-standard-annotation}
-\end{table}
-
-
-% The default page break is too awkward here.
-\clearpage
-
-%=============================================================================
-\subsection{General syntax for the standard annotation}
-%=============================================================================
-
-An outline of the format syntax is shown below.
-
-\vspace*{0.1ex}
-
-\begin{example}
-<SBML_ELEMENT +++ metaid="SBML_META_ID" +++ >
- +++
- <annotation>
- +++
- <rdf:RDF
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns\#"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:dcterm="http://purl.org/dc/terms/"
- xmlns:vcard="http://www.w3.org/2001/vcard-rdf/3.0\#"
- xmlns:bqbiol="http://biomodels.net/biology-qualifiers/"
- xmlns:bqmodel="http://biomodels.net/model-qualifiers/"
- >
- <rdf:Description rdf:about="#SBML_META_ID">
- [MODEL_HISTORY]
- <RELATION_ELEMENT>
- <rdf:Bag>
- <rdf:li rdf:resource="URI" />
- ...
- </rdf:Bag>
- </RELATION_ELEMENT>
- ...
- </rdf:Description>
- +++
- </rdf:RDF>
- +++
- </annotation>
- +++
-</SBML_ELEMENT>
-\end{example}
-
-The above outline shows the order of the elements. The capitalized
-identifiers refer to generic strings of a particular type:
-\texttt{SBML\_ELEMENT} refers to any SBML element name that can
-contain an \token{annotation} element; \texttt{SBML\_META\_ID} is
-a XML \primtype{ID} string; \texttt{RELATION\_ELEMENT} refers to
-element names in either the namespace
-\uri{http://biomodels.net/biology-qualifiers/} or
-\uri{http://biomodels.net/model-qualifiers/}; and \texttt{URI} is
-a URI. \texttt{[MODEL\_HISTORY]} refers to an optional section
-described in Section~\ref{sec:model-history-annotation} which can
-only be present within SBML model elements. `\texttt{+++}' is a
-placeholder for either no content or valid XML syntax that is not
-defined by the standard annotation scheme but is consistent with
-the relevant standards for the enclosing elements. `\texttt{...}'
-is a placeholder for zero or more elements of the same form as the
-immediately preceding element. The precise form of whitespace and
-the XML namespace prefix definitions is not constrained; however,
-the elements and attributes must be in the namespaces shown. The
-rest of this section describes the format formally in English.
-
-In this format, the annotation of an element is located in a single
-\token{rdf:RDF} element contained within an SBML
-\token{annotation} element. The annotation element can contain
-other elements in any order as described in
-Section~\ref{sec:annotation-use}. The format described in this
-section only defines the form of the \token{rdf:RDF} element. The
-containing SBML \SBase element must have a \token{metaid} attribute
-value. (As this attribute is of the type \primtype{ID} its value
-must unique to the entire SBML document.)
-
-
-\begin{blockChanged}
-
-The first element of the \token{rdf:RDF} element must be an
-\token{rdf:Description} element with an \token{rdf:about}
-attribute. The value of the
-\token{rdf:about} attribute must be of the form
-\texttt{\#<string>} where the string component is equal to the
-value of the \token{metaid} attribute of the containing SBML element.
-This format doesn't define the form of subsequent
-subelements of the \token{rdf:RDF} element. In particular, the unique \token{rdf:RDF} element contained in the annotation can contain other \token{rdf:Description}, which content can be any valid RDF.
-
-\end{blockChanged}
-
-The \token{rdf:Description} element can contain only an optional
-model history section (see
-Section~\ref{sec:model-history-annotation}) followed by a sequence
-of zero or more BioModels relation elements. The optional model
-history section can only be present within an SBML \Model element.
-The specific type of the relation elements will vary depending on
-the relationship between the SBML component and referenced
-information or resource.
-
-Although Section~\ref{sec:qualified-dc-annotation} describes the
-detailed semantics of each of the relation element types, the
-content of these elements follows the same form. The BioModels
-qualifiers relation elements must only contain a single
-\token{rdf:Bag} element which in turn must only contain one or
-more \token{rdf:li} elements. The \token{rdf:li} elements must
-only have a \token{rdf:resource} attribute containing a URI
-referring to an information resource (See
-Section~\ref{sec:uri-in-annotation}).
-
-Annotations in this format can be located at different depths
-within a model component.
-
-%=============================================================================
-\subsection{Use of URIs}
-\label{sec:uri-in-annotation}
-%=============================================================================
-
-The format represents a set of relationships between the SBML
-element and the resources referred to by the contained
-\token{rdf:resource} attribute values. The BioModels relation
-elements simply define the type of the relationship.
-
-For example, a \Species element representing a protein could be
-annotated with a reference to the database UniProt by the
-\changed{\uri{urn:miriam:uniprot:P12999}} resource identifier,
-identifying exactly the protein described by the \Species element.
-This identifier maps to a unique entry in UniProt which is never
-deleted from the database. In the case of UniProt, this is the
-``accession'' of the entry. When the entry is merged with another
-one, both ``accession'' are conserved. Similarly in a controlled
-vocabulary resource, each term is associated with a perennial
-identifier. The UniProt entry also possess an ``entry name'' (the
-Swiss-Prot ``identifier''), a ``protein name'', ``synonyms'' etc.
-Only the ``accession'' is perennial and should be used.
-
-The value of a \token{rdf:resource} attribute is a URI that both
-uniquely identifies the resource, and the data in the resource.
-\changed{The value of the \token{rdf:resource} attribute is a URI, not a
-URL; as such, a URI does not have to} \changed{reference a physical web
-object but simply identifies a controlled vocabulary term or
-database object (a URI is} \changed{a label). For instance, a true URL for an Internet
-resource such as \uri{http://www.uniprot.org/entry/P12999}} \changed{might
-correspond to the URI \uri{urn:miriam:uniprot:P12999}}.
-
-\begin{blockChanged}
-
-SBML does not specify how a parser is to interpret a URI. In the
-case of a transformation into a physical URL, there could be
-several solutions. For example, the URI
-\changed{\uri{urn:miriam:obo.go:GO\%3A0007268}} can be translated
-into:
-
-\end{blockChanged}
-
-\noindent \uri{http://www.ebi.ac.uk/ego/DisplayGoTerm?selected=GO:0007268}\\
-\noindent \uri{http://www.godatabase.org/cgi-bin/amigo/go.cgi?view=details\&query=GO:0007268}\\
-\noindent \uri{http://www.informatics.jax.org/searches/GO.cgi?id=GO:0007268}
-
-Similarly the URI \changed{\uri{urn:miriam:ec-code:3.5.4.4}} can refer to:
-
-\noindent \uri{http://www.ebi.ac.uk/intenz/query?cmd=SearchEC\&ec=3.5.4.4}\\
-\noindent \uri{http://www.expasy.org/cgi-bin/nicezyme.pl?3.5.4.4}\\
-\noindent \uri{http://www.chem.qmul.ac.uk/iubmb/enzyme/EC3/5/4/4.html}\\
-\noindent \uri{http://www.genome.jp/dbget-bin/www\_bget?ec:3.5.4.4}\\[1ex]
-\noindent etc.
-
-To enable interoperability, the community has agreed on an initial
-set of standardized valid URI syntax rules which may be used
-within the standard annotation format. This set of rules is not
-part of the SBML standard but will grow independently from
-specific SBML Levels and Versions. As the set changes\changed{,} a given URI
-syntax rule will not be modified\changed{,} although the physical resources
-associated with the rule may change. These URIs will always be
-composed as \changed{\token{resource:id}}. The MIRIAM Resources \changed{facility located at}
-\url{http://www.ebi.ac.uk/compneur-srv/miriam-main/} lists URI syntaxes and
-possible physical links to controlled \changed{vocabularies} and databases.
-Each entry contains a list of SBML and relation elements in which
-the given URI can be appropriately embedded. To enable consistent
-and thus useful links to external resources, the URI syntax rule
-set must have a consistent view of the concepts represented by the
-different SBML elements for the purposes of this format. \changed{For
-example, as the rule set is designed to link SBML biological and}
-\changed{biochemical resources the rule set assumes that a \Species element
-represents the concept of a biochemical} \changed{entity type rather than
-mathematical symbol}. The URI rule list will evolve with the
-evolution of databases and resources. The annotation format
-described in this section does not require a simple parser of this
-format to access this list.
-
-
-%=============================================================================
-\subsection{Relation elements}
-\label{sec:qualified-dc-annotation}
-%=============================================================================
-
-To enable the format to encode different types of relationships
-between SBML elements and resources, different BioModel qualifier
-elements are used to enclose a set of \token{rdf:li} elements. The
-relation elements imply a specific relationship between the
-enclosing SBML element and the resources referenced by the
-\token{rdf:li} elements.
-
-The detailed semantics (i.e. from the perspective of automatic
-parser) of the relation elements is defined by the URI list at
-\url{http://www.ebi.ac.uk/compneur-srv/miriam-main/}, and thus is outside the
-scope of SBML. The URI list generally assumes that the biological
-entity represented by the element is the concept linked to the
-reference resource.
-
-Several relation elements with a given tag, enclosed in the same
-SBML element, each represent an alternative annotation to the SBML
-element. For example two \token{bqbiol:hasPart} elements within a
-\Species SBML element represent two different sets of
-references to the parts making up the the chemical entity
-represented by the species. (The species is not made up of all the
-entities represented by all the references combined).
-
-The complete list of the qualifier elements in the Bio\changed{M}odels
-qualifier namespaces is documented at
-\changed{\url{http://www.ebi.ac.uk/compneur-srv/miriam-main/mdb?section=qualifiers}}. The list is
-divided into two namespaces one for model qualifiers
-\uri{http://biomodels.net/biology-qualifiers/} (prefix used here
-\token{bqbiol}) and the other for biological qualifiers
-\uri{http://biomodels.net/model-qualifiers/}) (prefix used here
-\token{bqmodel}. This list will only grow i.e no element will be
-removed from the list. The following is the list of elements at
-the time of writing:
-
-%\begin{figure}[htb]
-% \vspace*{2pt}
-% \centering
-%\[
-%%\begin{CD}
-%\textrm{SBML Element} @>{qualifier}>> \textrm{Referenced Resource} \\
-%@VV{represents}V @VV{represents}V \\
-%\textrm{Biological Entity A} @>{relationship}>>
-%\textrm{Biological Entity B}
-%%\end{CD}
-%\]
-% \caption{How the relationship between biological
-% entities are defined using relations between resources}
-% \label{fig:lenovere-annotation}
-%\end{figure}
-
-\begin{itemize}
-
-\item \token{bqmodel:is} The modeling object encoded by the SBML
- component is the subject of the referenced resource. For
- instance, this qualifier might be used to link the model to a
- model database.
-
-\item \token{bqmodel:isDescribedBy} The modeling object
- encoded by the SBML component is described by
- the referenced resource. This relation might be used to link
- SBML components to the literature that describes this model or
- this kinetic law.
-
-\item \token{bqbiol:is} The biological entity represented by the
- SBML component is the subject of the referenced resource. This
- relation might be used to link a reaction to its exact
- counterpart in (e.g.) KEGG or Reactome.
-
-\item \token{bqbiol:hasPart} The biological entity represented by
- the SBML component includes the subject of the referenced
- resource, either physically or logically. This relation might be
- used to link a complex to the description of its components.
-
-\item \token{bqbiol:isPartOf} The biological entity represented by
- the SBML component is a physical or logical part of the subject
- of the referenced resource. This relation might be used to link
- a component to the description of the complex it belongs to.
-
-\item \token{bqbiol:isVersionOf} The biological entity represented
- by the SBML component is a version or an instance of the subject
- of the referenced resource.
-
-\item \token{bqbiol:hasVersion} The subject of the referenced
- resource is a version or an instance of the biological entity
- represented by the SBML component.
-
-\item \token{bqbiol:isHomologTo} The biological entity represented
- by the SBML component is homolog, to the subject of the
- referenced resource, i.e. they share a common ancestor.
-
-\item \token{bqbiol:isDescribedBy} The biological entity
- represented by the SBML component is described by the referenced
- resource. This relation should be used, for example, to link a
- species or a parameter to the literature that describes the
- quantity of the species or the value of the parameter.
-
-\begin{blockChanged}
-
-\item \token{bqbiol:isEncodedBy} The biological entity represented
- by the model component is encoded, either directly or by virtue
- of transitivity, by the subject of the referenced resource.
-
-\item \token{bqbiol:encodes} The biological entity represented by
- the model component encodes, either directly or by virtue of
- transitivity, the subject of the referenced resource.
-
-\item \token{bqbiol:occursIn} The biological entity represented by the model component takes place in the subject of the reference resource.
-
-\end{blockChanged}
-
-\end{itemize}
-
-%In all cases using the biology qualifiers, the `object' of the
-%relation is the biological or biochemical object represented by
-%the enclosing SBML element. In the cases of the model qualifiers,
-%the `object' of the relation is the model component encoded by the
-%enclosing SBML element. The resources referenced by the
-%\class{rdf:li} elements contained within the relation element are
-%the `object' of the relation.
-
-
-%===============================================================
-\subsection{Model history}
-\label{sec:model-history-annotation}
-%================================================================
-
-When enclosed in an SBML \Model element, the format described in
-previous sections can include additional elements to describe the
-history of the model. This history data must occur immediately
-before the first BioModels relation elements. These additional
-elements encode information on the model creator and a sequence of
-dates recording changes to the model. The syntax for this section
-is outlined below.
-
-\begin{blockChanged}
-
-\begin{example}
-<dc:creator>
- <rdf:Bag>
- <rdf:li rdf:parseType="Resource">
- [[
- +++
- <vCard:N rdf:parseType="Resource">
- <vCard:Family>FAMILY_NAME</vCard:Family>
- <vCard:Given>GIVEN_NAME</vCard:Given>
- </vCard:N>
- +++
- [<vCard:EMAIL>EMAIL_ADDRESS</vCard:EMAIL>]
- +++
- [<vCard:ORG rdf:parseType="Resource" >
- <vCard:Orgname>ORGANIZATION_NAME</vCard:Orgname>
- </vCard:ORG>]
- +++
- ]]
- </rdf:li>
- ...
- </rdf:Bag>
-</dc:creator>
-<dcterms:created rdf:parseType="Resource">
- <dcterms:W3CDTF>DATE</dcterms:W3CDTF>
-</dcterms:created>
-<dcterms:modified rdf:parseType="Resource">
- <dcterms:W3CDTF>DATE</dcterms:W3CDTF>
-</dcterms:modified>
-\end{example}
-
-\end{blockChanged}
-
-The order of elements is as shown above except that elements of
-the format contained between \texttt{[[} and \texttt{]]} can occur
-in any order. The capitalized identifiers refer to generic
-strings of a particular type: \texttt{FAMILY\_NAME} is the family
-name of a person who created the model; \texttt{GIVEN\_NAME} is
-the first name of the same person who created the model;
-\texttt{EMAIL\_ADDRESS} is the email address of the same person
-who created the model; and \texttt{ORGANIZATION\_NAME} is the name
-of the organization with which the same person who created the
-model is affiliated \texttt{DATE} is a date in W3C date
-format~\citep{wolf:1998}. \texttt{W3CDTF}, \texttt{N},
-\texttt{ORG} and \texttt{EMAIL} are literal strings. The elements
-of the format contained between \texttt{[} and \texttt{]} are
-optional. `\texttt{+++}' is a placeholder for either no content or
-valid XML syntax that is not defined by the standard annotation
-scheme but is consistent with the relevant standards for the
-enclosing elements. `\texttt{...}' is a placeholder for zero or
-more elements of the same form as the immediately preceding
-element. The precise form of whitespace and the XML namespace
-prefix definitions is not constrained. The remaining text in this
-section describes the syntax formally in English.
-
-The additional elements of the model history sub-format consist in
-sequence of a \token{dc:creator} element, a
-\token{dcterms:created} element and zero or more
-\token{dcterms:modified} elements. \changed{The last two} elements must have
-the attribute \token{rdf:parseType} set to \texttt{Resource}.
-
-The \token{dc:creator} element describes the person who created
-the SBML encoding of the model and contains a single
-\token{rdf:Bag} element. The \token{rdf:Bag} element can contain
-any number of elements; however, the first element must be a
-\token{rdf:li} element. The \token{rdf:li} element can contain
-any number of elements in any order. The set of elements
-contained with the \token{rdf:li} element can include the
-following informative elements: \token{vCard:N},
-\token{vCard:EMAIL} and \token{vCard:ORG}. The \token{vCard:N}
-contains the name of the creator and must consist of a sequence of
-two elements: \token{vCard:Family} and the \token{vCard:Given}
-whose content is the family (surname) and given (first) names of
-the creator respectively. The \token{vCard:N} must have the
-attribute \token{rdf:parseType} set to \texttt{Resource}. The
-content of the \token{vCard:EMAIL} element must be the email
-address of the creator. The content of the \token{vCard:ORG}
-element must contain a single \token{vCard:Orgname} element. The
-\token{vCard:Orgname} element must contain the name of an
-organization to which the creator is affiliated.
-
-The \token{dcterms:created} and \token{dcterms:modified} elements
-must each contain a single \token{dcterms:W3CDTF} element whose
-content is a date in W3C date format~\citep{wolf:1998} which is a
-a profile of (restricted form of) ISO 8601.
-
-
-%================================================================
-\subsection{Examples}
-%=================================================================
-
-The following shows the annotation of a model with model creation
-data and links to external resources:
-
-\begin{blockChanged}
-\begin{example}
-<model metaid="_180340" id="GMO" name="Goldbeter1991_MinMitOscil">
- <annotation>
- <rdf:RDF
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns\#"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:dcterms="http://purl.org/dc/terms/"
- xmlns:vCard="http://www.w3.org/2001/vcard-rdf/3.0\#"
- xmlns:bqbiol="http://biomodels.net/biology-qualifiers/"
- xmlns:bqmodel="http://biomodels.net/model-qualifiers/"
- >
- <rdf:Description rdf:about="#_180340">
- <dc:creator>
- <rdf:Bag>
- <rdf:li rdf:parseType="Resource">
- <vCard:N rdf:parseType="Resource">
- <vCard:Family>Shapiro</vCard:Family>
- <vCard:Given>Bruce</vCard:Given>
- </vCard:N>
- <vCard:EMAIL>bsh...@jp...</vCard:EMAIL>
- <vCard:ORG rdf:parseType="Resource">
- <vCard:Orgname>NASA Jet Propulsion Laboratory</vCard:Orgname>
- </vCard:ORG>
- </rdf:li>
- </rdf:Bag>
- </dc:creator>
- <dcterms:created rdf:parseType="Resource">
- <dcterms:W3CDTF>2005-02-06T23:39:40+00:00</dcterms:W3CDTF>
- </dcterms:created>
- <dcterms:modified rdf:parseType="Resource">
- <dcterms:W3CDTF>2005-09-13T13:24:56+00:00</dcterms:W3CDTF>
- </dcterms:modified>
- <bqmodel:is>
- <rdf:Bag>
- <rdf:li rdf:resource="urn:miriam:biomodels.db:BIOMD0000000003"/>
- </rdf:Bag>
- </bqmodel:is>
- <bqmodel:isDescribedBy>
- <rdf:Bag>
- <rdf:li rdf:resource="urn:miriam:pubmed:1833774"/>
- </rdf:Bag>
- </bqmodel:isDescribedBy>
- <bqbiol:isVersionOf>
- <rdf:Bag>
- <rdf:li rdf:resource="urn:miriam:kegg.pathway:hsa04110"/>
- <rdf:li rdf:resource="urn:miriam:reactome:REACT_152"/>
- </rdf:Bag>
- </bqbiol:isVersionOf>
- </rdf:Description>
- </rdf:RDF>
-</annotation>
-\end{example}
-
-\end{blockChanged}
-
-\changed{}The following example shows a \Reaction structure annotated
-with a reference to its exact Reactome counterpart.
-
-\begin{blockChanged}
-\begin{example}
-<reaction id="cdc2Phospho" metaid="jb007">
- <annotation>
- <rdf:RDF
- xmlns:bqbiol="http://biomodels.net/biology-qualifiers/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns\#"
- >
- <rdf:Description rdf:about="#jb007">
- <bqbiol:is>
- <rdf:Bag>
- <rdf:li rdf:resource="urn:miriam:reactome:REACT_6327"/>
- </rdf:Bag>
- </bqbiol:is>
- </rdf:Description>
- </rdf:RDF>
- </annotation>
- <listOfReactants>
- <speciesReference species="cdc2"/>
- </listOfReactants>
- <listOfProducts>
- <speciesReference species="cdc2-Y15P"/>
- </listOfProducts>
- <listOfModifiers>
- <modifierSpeciesReference species="wee1"/>
- </listOfModifiers>
-</reaction>
-\end{example}
-\end{blockChanged}
-
-The following example describes a species that represents a
-complex between the protein calmodulin and calcium ions:
-
-\begin{blockChanged}
-\begin{example}
-<species id="Ca_calmodulin" metaid="cacam">
- <annotation>
- <rdf:RDF
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns\#"
- xmlns:bqbiol="http://biomodels.net/biology-qualifiers/"
- >
- <rdf:Description rdf:about="\#cacam">
- <bqbiol:hasPart>
- <rdf:Bag>
- <rdf:li rdf:resource="urn:miriam:uniprot:P62158"/>
- <rdf:li rdf:resource="urn:miriam:kegg.compound:C00076"/>
- </rdf:Bag>
- </bqbiol:hasPart>
- </rdf:Description>
- </rdf:RDF>
- </annotation>
-</species>
-\end{example}
-\end{blockChanged}
-
-The following example describes a species that represents either
-``Calcium/calmodulin-dependent protein kinase type II alpha
-chain'' or ``Calcium/calmodulin-dependent protein kinase type II
-beta chain''. This is the case, for example, in the somatic
-cytoplasm of striatal medium-size spiny neurons, where both are
-present but they cannot be functionally differentiated.
-
-\begin{blockChanged}
-\begin{example}
-<species id="calcium_calmodulin" metaid="cacam">
- <annotation>
- <rdf:RDF
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns\#"
- xmlns:bqbiol="http://biomodels.net/biology-qualifiers/"
- >
- <rdf:Description rdf:about="\#cacam">
- <bqbiol:hasVersion>
- <rdf:Bag>
- <rdf:li rdf:resource="urn:miriam:uniprot:Q9UQM7"/>
- <rdf:li rdf:resource="urn:miriam:uniprot:Q13554"/>
- </rdf:Bag>
- </bqbiol:hasVersion>
- </rdf:Description>
- </rdf:RDF>
- </annotation>
-</species>
-\end{example}
-\end{blockChanged}
-
-The above approach should not be used to describe ``any
-Calcium/calmodulin-dependent protein kinase type II chain'',
-because such an annotation requires referencing the products of
-other genes such as gamma or delta. All the known proteins could
-be enumerated, but such an approach would almost surely lead to
-inaccuracies because biological knowledge continues to evolve.
-Instead, the annotation should refer to generic information such
-as Ensembl family ENSF00000000194 ``CALCIUM/CALMODULIN DEPENDENT
-KINASE TYPE II CHAIN'' or PIR superfamily PIRSF000594
-``Calcium/calmodulin-dependent protein kinase type~II''.
-
-%While with \texttt{HasVersion}, the described component could
-%represent several alternative, with \texttt{isVersionOf} the
-%described component is one of the alternative understated by the
-%referenced resource.
-
-The following two examples show how to use the qualifier
-\token{isVersionOf}. The first example is the relationship
-between a reaction and an EC code. An EC code describes an
-enzymatic activity and an enzymatic reaction involving a
-particular enzyme can be seen as an instance of this activity. For
-example, the following reaction represents the phosphorylation of
-a glutamate receptor by a complex calcium/calmodulin kinase II.
-
-\begin{blockChanged}
-\begin{example}
-<reaction id="NMDAR_phosphorylation" metaid="thx1138">
- <annotation>
- <rdf:RDF
- xmlns:bqbiol="http://biomodels.net/biology-qualifiers/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns\#"
- >
- <rdf:Description rdf:about="#thx1138">
- <bqbiol:isVersionOf>
- <rdf:Bag>
- <rdf:li rdf:resource="urn:miriam:ec-code:2.7.1.17"/>
- </rdf:Bag>
- </bqbiol:isVersionOf>
- </rdf:Description>
- </rdf:RDF>
- </annotation>
- <listOfReactants>
- <speciesReference species="NMDAR"/>
- </listOfReactants>
- <listOfProducts>
- <speciesReference species="P-NMDAR"/>
- </listOfProducts>
- <listOfModifiers>
- <modifierSpeciesReference species="CaMKII"/>
- </listOfModifiers>
- <kineticLaw>
- <math xmlns="http://www.w3.org/1998/Math/MathML">
- <apply>
- <times/>
- <ci>CaMKII</ci>
- <ci>kcat</ci>
- <apply>
- <divide/>
- <ci>NMDAR</ci>
- <apply>
- </times>
- <ci>NMDAR</ci>
- <ci>Km</ci>
- </apply>
- </apply>
- </apply>
- </math>
- <listOfParameters>
- <parameter id="kcat" value="1"/>
- <parameter id="Km" value="5e-10"/>
- </listOfParameters>
- </kineticLaw>
-</reaction>
-\end{example}
-\end{blockChanged}
-
-The second example of the use of \token{isVersionOf} is the
-complex between Calcium/calmodulin-dependent protein kinase type
-II alpha chain and Calcium/calmodulin, that is only one of the
-``calcium- and calmodulin-dependent protein kinase complexes''
-described by the Gene Ontology term GO:0005954.
-
-\begin{blockChanged}
-\begin{example}
-<species id="CaCaMKII" metaid="C8H10N4O2">
- <annotation>
- <rdf:RDF
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns\#"
- xmlns:bqbiol="http://biomodels.net/biology-qualifiers/"
- >
- <rdf:Description rdf:about="\#C8H10N4O2">
- <bqbiol:isVersionOf>
- <rdf:Bag>
- <rdf:li rdf:resource="urn:miriam:obo.go:GO\%3A0005954"/>
- </rdf:Bag>
- </bqbiol:isVersionOf>
- </rdf:Description>
- </rdf:RDF>
- </annotation>
-</species>
-\end{example}
-\end{blockChanged}
-
-The previous case is different form the following one, although they
-could seem similar at first sight. The
-``Calcium/calmodulin-dependent protein kinase type II alpha
-chain'' is a part of the above mentioned ``calcium- and
-calmodulin-dependent protein kinase complex''.
-
-\begin{blockChanged}
-\begin{example}
-<species id="CaMKIIalpha" metaid="C10H14N2">
- <annotation>
- <rdf:RDF
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns\#"
- xmlns:bqbiol="http://biomodels.net/biology-qualifiers/"
- >
- <rdf:Description rdf:about="\#C10H14N2">
- <bqbiol:isPartOf>
- <rdf:Bag>
- <rdf:li rdf:resource="urn:miriam:obo.go:GO\%3A0005954"/>
- </rdf:Bag>
- </bqbiol:isPartOf>
- </rdf:Description>
- </rdf:RDF>
- </annotation>
-</species>
-\end{example}
-\end{blockChanged}
-
-It is possible describe a component with several alternative sets
-of qualified annotations. For example, the following species
-represents a pool of GMP, GDP and GTP. We annotate it with the
-three corresponding KEGG compound identifiers but also with the
-three corresponding ChEBI identifiers. The two alternative
-annotations are encoded in separate \token{hasVersion} qualifier
-elements.
-
-\begin{blockChanged}
-\begin{example}
-<species id="GXP" metaid="GXP">
- <annotation>
- <rdf:RDF
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns\#"
- xmlns:bqbiol="http://biomodels.net/biology-qualifiers/"
- >
- <rdf:Description rdf:about="\#GXP">
- <bqbiol:hasVersion>
- <rdf:Bag>
- <rdf:li rdf:resource="urn:miriam:obo.chebi:CHEBI\%3A17345"/>
- <rdf:li rdf:resource="urn:miriam:obo.chebi:CHEBI\%3A17552"/>
- <rdf:li rdf:resource="urn:miriam:obo.chebi:CHEBI\%3A17627"/>
- </rdf:Bag>
- </bqbiol:hasVersion>
- <bqbiol:hasVersion>
- <rdf:Bag>
- <rdf:li rdf:resource="urn:miriam:kegg.compound:C00035"/>
- <rdf:li rdf:resource="urn:miriam:kegg.compound:C00044"/>
- <rdf:li rdf:resource="urn:miriam:kegg.compound:C00144"/>
- </rdf:Bag>
- </bqbiol:hasVersion>
- </rdf:Description>
- </rdf:RDF>
- </annotation>
-</species>
-\end{example}
-\end{blockChanged}
-
-The following example presents a reaction being actually the
-combination of three different elementary molecular reactions. We
-annotate it with the three corresponding KEGG reactions, but also
-with the three corresponding enzymatic activities. Again the two
-\token{hasPart} elements represent two alternative annotations.
-The process represented by the \Reaction structure is
-composed of three parts, and not six parts.
-
-\begin{blockChanged}
-\begin{example}
-<reaction id="adenineProd" metaid="adeprod">
- <annotation>
- <rdf:RDF
- xmlns:bqbiol="http://biomodels.net/biology-qualifiers/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns\#"
- >
- <rdf:Description rdf:about="\#adeprod">
- <bqbiol:hasPart>
- <rdf:Bag>
- <rdf:li rdf:resource="urn:miriam:ec-code:2.5.1.22"/>
- <rdf:li rdf:resource="urn:miriam:ec-code:3.2.2.16"/>
- <rdf:li rdf:resource="urn:miriam:ec-code:4.1.1.50"/>
- </rdf:Bag>
- </bqbiol:hasPart>
- <bqbiol:hasPart>
- <rdf:Bag>
- <rdf:li rdf:resource="urn:miriam:kegg.reaction:R00178"/>
- <rdf:li rdf:resource="urn:miriam:kegg.reaction:R01401"/>
- <rdf:li rdf:resource="urn:miriam:kegg.reaction:R02869"/>
- </rdf:Bag>
- </bqbiol:hasPart>
- </rdf:Description>
- </rdf:RDF>
- </annotation>
-</reaction>
-\end{example}
-\end{blockChanged}
-
-It is possible to mix different URIs in a given set. The
-following example presents two alternative annotations of the human
-hemoglobin, the first with ChEBI heme and the second with KEGG
-heme.
-
-\begin{blockChanged}
-\begin{example}
-<species id="heme" metaid="heme">
- <annotation>
- <rdf:RDF
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns\#"
- xmlns:bqbiol="http://biomodels.net/biology-qualifiers/"
- >
- <rdf:Description rdf:about="\#heme">
- <bqbiol:hasPart>
- <rdf:Bag>
- <rdf:li rdf:resource="urn:miriam:uniprot:P69905"/>
- <rdf:li rdf:resource="urn:miriam:uniprot:P68871"/>
- <rdf:li rdf:resource="urn:miriam:obo.chebi:CHEBI\%3A17627">
- </rdf:Bag>
- </bqbiol:hasPart>
- <bqbiol:hasPart>
- <rdf:Bag>
- <rdf:li rdf:resource="urn:miriam:uniprot:P69905"/>
- <rdf:li rdf:resource="urn:miriam:uniprot:P68871"/>
- <rdf:li rdf:resource="urn:miriam:kegg.compound:C00032"/>
- </rdf:Bag>
- </bqbiol:hasPart>
- </rdf:Description>
- </rdf:RDF>
- </annotation>
-</species>
-\end{example}
-\end{blockChanged}
-
-As formally defined above it is possible to use different
-qualifiers in the same annotation element. The following
-phosphorylation is annotated by its exact KEGG counterpart and by
-the generic GO term ``phosphorylation''.
-
-\begin{blockChanged}
-\begin{example}
-<reaction id="phosphorylation" metaid="phosphorylation">
- <annotation>
- <rdf:RDF
- xmlns:bqbiol="http://biomodels.net/biology-qualifiers/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns\#"
- >
- <rdf:Description rdf:about="\#phosphorylation">
- <bqbiol:is>
- <rdf:Bag>
- <rdf:li rdf:resource="urn:miriam:kegg.reaction:R03313" />
- </rdf:Bag>
- </bqbiol:is>
- <bqbiol:isVersionOf>
- <rdf:Bag>
- <rdf:li rdf:resource="urn:miriam:obo.go:GO\%3A0016310" />
- </rdf:Bag>
- </bqbiol:isVersionOf>
- </rdf:Description>
- </rdf:RDF>
- </annotation>
-</reaction>
-\end{example}
-\end{blockChanged}
Copied: trunk/specifications/sbml-level-3/version-1/core/spec/annotations.tex (from rev 8660, trunk/specifications/sbml-level-2/version-4/spec/annotations.tex)
===================================================================
--- trunk/specifications/sbml-level-3/version-1/core/spec/annotations.tex (rev 0)
+++ trunk/specifications/sbml-level-3/version-1/core/spec/annotations.tex 2009-03-25 15:35:55 UTC (rev 9419)
@@ -0,0 +1,934 @@
+% -*- TeX-master: "sbml-level-2-version-4"; fill-column: 66 -*-
+% $Id$
+% $HeadURL$
+% ----------------------------------------------------------------
+
+\section{A standard format for the \token{annotation} element}
+\label{sec:finney-novere}
+\label{sec:annotation-standard}
+
+This section describes the recommended non-proprietary
+format for the content of \token{annotation} elements
+in SBML when (a) referring to controlled vocabulary
+terms and database identifiers which define and describe
+biological and biochemical entities, and (b) describing the
+creator of a model and its modification history. Such a structured
+format should facilitate the generation of models compliant with
+the MIRIAM guidelines for model curation~\citep{le_novere:2005}.
+
+The format described in this section is intended to be the form of
+one of the top-level elements that could reside in an
+\token{annotation} element attached to an SBML object derived from
+\SBase. The element is named \token{rdf:RDF}. The format
+described here is compliant with the constraints placed on the
+form of annotation elements described in
+Section~\ref{sec:annotation-use}. We refer readers to
+Section~\ref{sec:annotation-use} for important information on the
+structure and organization of application-specific annotations;
+these are not described here.
+
+
+\subsection{Motivation}
+
+The SBML structures described elsewhere in this document do not
+have any biochemical or biological semantics. The format
+described in this section provides a scheme for linking SBML
+structures to external resources so that those structures can have
+such semantics. The motivation for the introduction of this
+scheme is similar to that given for the introduction of
+\token{sboTerm}; however, this scheme is significantly more
+flexible.
+
+\begin{blockChanged}
+
+It is generally not recommended that this format be used to refer
+to SBO terms. In most cases, the SBO terms should be referred to
+using the attribute \token{sboTerm} part of \token{SBase}
+(Section~\ref{sec:sboTerm}). However in certain situations, for instance
+to be able to add further information about the functional role of a
+species, it is necessary to add this additional information using the
+annotation format described here.
+
+\end{blockChanged}
+
+\subsection{XML namespaces in the standard annotation}
+
+This format uses a restricted form of Dublin
+Core~\citep{DCMI:2003} and BioModels qualifier elements (see
+\url{http://www.ebi.ac.uk/compneur-srv/miriam-main/mdb?section=qualifiers}) embedded in
+RDF~\citep{w3c:2004}. It uses a number of external XML standards
+and associated XML namespaces.
+Table~\ref{tab:namespaces-for-standard-annotation} lists these
+namespaces and relevant documentation on those namespaces. The
+format constrains the order of elements in these namespaces beyond
+the constraints defined in the standard definitions for those
+namespaces. For each standard listed, the format only uses a
+subset of the possible syntax defined by the given standard. Thus
+it is possible for an \token{annotation} element to include XML
+that is compliant with those external standards but is not
+compliant with the format described here. Parsers wishing to
+support this format should be aware that a valid
+\token{annotation} element may contain an \token{rdf:RDF} element
+which is not compliant with the format described here. A parser
+should check that all aspects of the syntax defined here before
+assuming that the contained data is encoded in the format.
+
+\begin{table}[bh]
+ \vspace*{3ex}
+ \small
+ \centering
+ \begin{edtable}{tabular}{lll}
+ \toprule
+& Namespace URI & Definition Document \\
+ \midrule
+ \token{dc} & \uri{http://purl.org/dc/elements/1.1/} & \cite{powell:2003}\\
+ \token{rdf} & \uri{http://www.w3.org/1999/02/22-rdf-syntax-ns\#} & \cite{w3c:2004b} \\
+ \token{dcterms} & \uri{http://purl.org/dc/terms/} & \cite{kokkelink:2002}\\
+ & & \cite{DCMIUB:2005} \\
+ \token{vcard} & \uri{http://www.w3.org/2001/vcard-rdf/3.0\#} & \cite{iannella:2001} \\
+ \token {bqbiol} & \uri{http://biomodels.net/biology-qualifiers/} \\
+ \token {bqmodel} & \uri{http://biomodels.net/model-qualifiers/} \\
+ \bottomrule
+ \end{edtable}
+ \vspace*{-0.95ex}
+ \caption{The XML standards used in the SBML standard format for annotation.
+ The namespace prefix are shown to indicate only the prefix used in the main text.}
+ \label{tab:namespaces-for-standard-annotation}
+\end{table}
+
+
+% The default page break is too awkward here.
+\clearpage
+
+%=============================================================================
+\subsection{General syntax for the standard annotation}
+%=============================================================================
+
+An outline of the format syntax is shown below.
+
+\vspace*{0.1ex}
+
+\begin{example}
+<SBML_ELEMENT +++ metaid="SBML_META_ID" +++ >
+ +++
+ <annotation>
+ +++
+ <rdf:RDF
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns\#"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:dcterm="http://purl.org/dc/terms/"
+ xmlns:vcard="http://www.w3.org/2001/vcard-rdf/3.0\#"
+ xmlns:bqbiol="http://biomodels.net/biology-qualifiers/"
+ xmlns:bqmodel="http://biomodels.net/model-qualifiers/"
+ >
+ <rdf:Description rdf:about="#SBML_META_ID">
+ [MODEL_HISTORY]
+ <RELATION_ELEMENT>
+ <rdf:Bag>
+ <rdf:li rdf:resource="URI" />
+ ...
+ </rdf:Bag>
+ </RELATION_ELEMENT>
+ ...
+ </rdf:Description>
+ +++
+ </rdf:RDF>
+ +++
+ </annotation>
+ +++
+</SBML_ELEMENT>
+\end{example}
+
+The above outline shows the order of the elements. The capitalized
+identifiers refer to generic strings of a particular type:
+\texttt{SBML\_ELEMENT} refers to any SBML element name that can
+contain an \token{annotation} element; \texttt{SBML\_META\_ID} is
+a XML \primtype{ID} string; \texttt{RELATION\_ELEMENT} refers to
+element names in either the namespace
+\uri{http://biomodels.net/biology-qualifiers/} or
+\uri{http://biomodels.net/model-qualifiers/}; and \texttt{URI} is
+a URI. \texttt{[MODEL\_HISTORY]} refers to an optional section
+described in Section~\ref{sec:model-history-annotation} which can
+only be present within SBML model elements. `\texttt{+++}' is a
+placeholder for either no content or valid XML syntax that is not
+defined by the standard annotation scheme but is consistent with
+the relevant standards for the enclosing elements. `\texttt{...}'
+is a placeholder for zero or more elements of the same form as the
+immediately preceding element. The precise form of whitespace and
+the XML namespace prefix definitions is not constrained; however,
+the elements and attributes must be in the namespaces shown. The
+rest of this section describes the format formally in English.
+
+In this format, the annotation of an element is located in a single
+\token{rdf:RDF} element contained within an SBML
+\token{annotation} element. The annotation element can contain
+other elements in any order as described in
+Section~\ref{sec:annotation-use}. The format described in this
+section only defines the form of the \token{rdf:RDF} element. The
+containing SBML \SBase element must have a \token{metaid} attribute
+value. (As this attribute is of the type \primtype{ID} its value
+must unique to the entire SBML document.)
+
+
+\begin{blockChanged}
+
+The first element of the \token{rdf:RDF} element must be an
+\token{rdf:Description} element with an \token{rdf:about}
+attribute. The value of the
+\token{rdf:about} attribute must be of the form
+\texttt{\#<string>} where the string component is equal to the
+value of the \token{metaid} attribute of the containing SBML element.
+This format doesn't define the form of subsequent
+subelements of the \token{rdf:RDF} element. In particular, the unique \token{rdf:RDF} element contained in the annotation can contain other \token{rdf:Description}, which content can be any valid RDF.
+
+\end{blockChanged}
+
+The \token{rdf:Description} element can contain only an optional
+model history section (see
+Section~\ref{sec:model-history-annotation}) followed by a sequence
+of zero or more BioModels relation elements. The optional model
+history section can only be present within an SBML \Model element.
+The specific type of the relation elements will vary depending on
+the relationship between the SBML component and referenced
+information or resource.
+
+Although Section~\ref{sec:qualified-dc-annotation} describes the
+detailed semantics of each of the relation element types, the
+content of these elements follows the same form. The BioModels
+qualifiers relation elements must only contain a single
+\token{rdf:Bag} element which in turn must only contain one or
+more \token{rdf:li} elements. The \token{rdf:li} elements must
+only have a \token{rdf:resource} attribute containing a URI
+referring to an information resource (See
+Section~\ref{sec:uri-in-annotation}).
+
+Annotations in this format can be located at different depths
+within a model component.
+
+%=============================================================================
+\subsection{Use of URIs}
+\label{sec:uri-in-annotation}
+%=============================================================================
+
+The format represents a set of relationships between the SBML
+element and the resources referred to by the contained
+\token{rdf:resource} attribute values. The BioModels relation
+elements simply define the type of the relationship.
+
+For example, a \Species element representing a protein could be
+annotated with a reference to the database UniProt by the
+\changed{\uri{urn:miriam:uniprot:P12999}} resource identifier,
+identifying exactly the protein described by the \Species element.
+This identifier maps to a unique entry in UniProt which is never
+deleted from the database. In the case of UniProt, this is the
+``accession'' of the entry. When the entry is merged with another
+one, both ``accession'' are conserved. Similarly in a controlled
+vocabulary resource, each term is associated with a perennial
+identifier. The UniProt entry also possess an ``entry name'' (the
+Swiss-Prot ``identifier''), a ``protein name'', ``synonyms'' etc.
+Only the ``accession'' is perennial and should be used.
+
+The value of a \token{rdf:resource} attribute is a URI that both
+uniquely identifies the resource, and the data in the resource.
+\changed{The value of the \token{rdf:resource} attribute is a URI, not a
+URL; as such, a URI does not have to} \changed{reference a physical web
+object but simply identifies a controlled vocabulary term or
+database object (a URI is} \changed{a label). For instance, a true URL for an Internet
+resource such as \uri{http://www.uniprot.org/entry/P12999}} \changed{might
+correspond to the URI \uri{urn:miriam:uniprot:P12999}}.
+
+\begin{blockChanged}
+
+SBML does not specify how a parser is to interpret a URI. In the
+case of a transformation into a physical URL, there could be
+several solutions. For example, the URI
+\changed{\uri{urn:miriam:obo.go:GO\%3A0007268}} can be translated
+into:
+
+\end{blockChanged}
+
+\noindent \uri{http://www.ebi.ac.uk/ego/DisplayGoTerm?selected=GO:0007268}\\
+\noindent \uri{http://www.godatabase.org/cgi-bin/amigo/go.cgi?view=details\&query=GO:0007268}\\
+\noindent \uri{http://www.informatics.jax.org/searches/GO.cgi?id=GO:0007268}
+
+Similarly the URI \changed{\uri{urn:miriam:ec-code:3.5.4.4}} can refer to:
+
+\noindent \uri{http://www.ebi.ac.uk/intenz/query?cmd=SearchEC\&ec=3.5.4.4}\\
+\noindent \uri{http://www.expasy.org/cgi-bin/nicezyme.pl?3.5.4.4}\\
+\noindent \uri{http://www.chem.qmul.ac.uk/iubmb/enzyme/EC3/5/4/4.html}\\
+\noindent \uri{http://www.genome.jp/dbget-bin/www\_bget?ec:3.5.4.4}\\[1ex]
+\noindent etc.
+
+To enable interoperability, the community has agreed on an initial
+set of standardized valid URI syntax rules which may be used
+within the standard annotation format. This set of rules is not
+part of the SBML standard but will grow independently from
+specific SBML Levels and Versions. As the set changes\changed{,} a given URI
+syntax rule will not be modified\changed{,} although the physical resources
+associated with the rule may change. These URIs will always be
+composed as \changed{\token{resource:id}}. The MIRIAM Resources \changed{facility located at}
+\url{http://www.ebi.ac.uk/compneur-srv/miriam-main/} lists URI syntaxes and
+possible physical links to controlled \changed{vocabularies} and databases.
+Each entry contains a list of SBML and relation elements in which
+the given URI can be appropriately embedded. To enable consistent
+and thus useful links to external resources, the URI syntax rule
+set must have a consistent view of the concepts represented by the
+different SBML elements for the purposes of this format. \changed{For
+example, as the rule set is designed to link SBML biological and}
+\changed{biochemical resources the rule set assumes that a \Species element
+represents the concept of a biochemical} \changed{entity type rather than
+mathematical symbol}. The URI rule list will evolve with the
+evolution of databases and resources. The annotation format
+described in this section does not require a simple parser of this
+format to access this list.
+
+
+%=============================================================================
+\subsection{Relation elements}
+\label{sec:qualified-dc-annotation}
+%=============================================================================
+
+To enable the format to encode different types of relationships
+between SBML elements and resources, different BioModel qualifier
+elements are used to enclose a set of \token{rdf:li} elements. The
+relation elements imply a specific relationship between the
+enclosing SBML element and the resources referenced by the
+\token{rdf:li} elements.
+
+The detailed semantics (i.e. from the perspective of automatic
+parser) of the relation elements is defined by the URI list at
+\url{http://www.ebi.ac.uk/compneur-srv/miriam-main/}, and thus is outside the
+scope of SBML. The URI list generally assumes that the biological
+entity represented by the element is the concept linked to the
+reference resource.
+
+Several relation elements with a given tag, enclosed in the same
+SBML element, each represent an alternative annotation to the SBML
+element. For example two \token{bqbiol:hasPart} elements within a
+\Species SBML element represent two different sets of
+references to the parts making up the the chemical entity
+represented by the species. (The species is not made up of all the
+entities represented by all the references combined).
+
+The complete list of the qualifier elements in the Bio\changed{M}odels
+qualifier namespaces is documented at
+\changed{\url{http://www.ebi.ac.uk/compneur-srv/miriam-main/mdb?section=qualifiers}}. The list is
+divided into two namespaces one for model qualifiers
+\uri{http://biomodels.net/biology-qualifiers/} (prefix used here
+\token{bqbiol}) and the other for biological qualifiers
+\uri{http://biomodels.net/model-qualifiers/}) (prefix used here
+\token{bqmodel}. This list will only grow i.e no element will be
+removed from the list. The following is the list of elements at
+the time of writing:
+
+%\begin{figure}[htb]
+% \vspace*{2pt}
+% \centering
+%\[
+%%\begin{CD}
+%\textrm{SBML Element} @>{qualifier}>> \textrm{Referenced Resource} \\
+%@VV{represents}V @VV{represents}V \\
+%\textrm{Biological Entity A} @>{relationship}>>
+%\textrm{Biological Entity B}
+%%\end{CD}
+%\]
+% \caption{How the relationship between biological
+% entities are defined using relations between resources}
+% \label{fig:lenovere-annotation}
+%\end{figure}
+
+\begin{itemize}
+
+\item \token{bqmodel:is} The modeling object encoded by the SBML
+ component is the subject of the referenced resource. For
+ instance, this qualifier might be used to link the model to a
+ model database.
+
+\item \token{bqmodel:isDescribedBy} The modeling object
+ encoded by the SBML component is described by
+ the referenced resource. This relation might be used to link
+ SBML components to the literature that describes this model or
+ this kinetic law.
+
+\item \token{bqbiol:is} The biological entity represen...
[truncated message content] |
|
From: <sar...@us...> - 2009-03-24 13:11:47
|
Revision: 9418
http://sbml.svn.sourceforge.net/sbml/?rev=9418&view=rev
Author: sarahkeating
Date: 2009-03-24 13:11:37 +0000 (Tue, 24 Mar 2009)
Log Message:
-----------
created model archive
Modified Paths:
--------------
trunk/test-suite/.cases-archive-date
Modified: trunk/test-suite/.cases-archive-date
===================================================================
--- trunk/test-suite/.cases-archive-date 2009-03-23 15:14:18 UTC (rev 9417)
+++ trunk/test-suite/.cases-archive-date 2009-03-24 13:11:37 UTC (rev 9418)
@@ -1 +1 @@
-2008-09-17
+2009-03-24
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mh...@us...> - 2009-03-23 15:14:59
|
Revision: 9417
http://sbml.svn.sourceforge.net/sbml/?rev=9417&view=rev
Author: mhucka
Date: 2009-03-23 15:14:18 +0000 (Mon, 23 Mar 2009)
Log Message:
-----------
Removed .eps versions of plot files. They are likely out of date.
Removed Paths:
-------------
trunk/test-suite/cases/semantic/00001/00001-plot.eps
trunk/test-suite/cases/semantic/00002/00002-plot.eps
trunk/test-suite/cases/semantic/00003/00003-plot.eps
trunk/test-suite/cases/semantic/00004/00004-plot.eps
trunk/test-suite/cases/semantic/00005/00005-plot.eps
trunk/test-suite/cases/semantic/00006/00006-plot.eps
trunk/test-suite/cases/semantic/00007/00007-plot.eps
trunk/test-suite/cases/semantic/00008/00008-plot.eps
trunk/test-suite/cases/semantic/00009/00009-plot.eps
trunk/test-suite/cases/semantic/00011/00011-plot.eps
trunk/test-suite/cases/semantic/00012/00012-plot.eps
trunk/test-suite/cases/semantic/00013/00013-plot.eps
trunk/test-suite/cases/semantic/00014/00014-plot.eps
trunk/test-suite/cases/semantic/00015/00015-plot.eps
trunk/test-suite/cases/semantic/00016/00016-plot.eps
trunk/test-suite/cases/semantic/00017/00017-plot.eps
trunk/test-suite/cases/semantic/00018/00018-plot.eps
trunk/test-suite/cases/semantic/00019/00019-plot.eps
trunk/test-suite/cases/semantic/00020/00020-plot.eps
trunk/test-suite/cases/semantic/00023/00023-plot.eps
trunk/test-suite/cases/semantic/00024/00024-plot.eps
trunk/test-suite/cases/semantic/00025/00025-plot.eps
trunk/test-suite/cases/semantic/00026/00026-plot.eps
trunk/test-suite/cases/semantic/00028/00028-plot.eps
trunk/test-suite/cases/semantic/00029/00029-plot.eps
trunk/test-suite/cases/semantic/00030/00030-plot.eps
trunk/test-suite/cases/semantic/00031/00031-plot.eps
trunk/test-suite/cases/semantic/00032/00032-plot.eps
trunk/test-suite/cases/semantic/00033/00033-plot.eps
trunk/test-suite/cases/semantic/00034/00034-plot.eps
trunk/test-suite/cases/semantic/00035/00035-plot.eps
trunk/test-suite/cases/semantic/00036/00036-plot.eps
trunk/test-suite/cases/semantic/00037/00037-plot.eps
trunk/test-suite/cases/semantic/00038/00038-plot.eps
trunk/test-suite/cases/semantic/00039/00039-plot.eps
trunk/test-suite/cases/semantic/00040/00040-plot.eps
trunk/test-suite/cases/semantic/00041/00041-plot.eps
trunk/test-suite/cases/semantic/00042/00042-plot.eps
trunk/test-suite/cases/semantic/00043/00043-plot.eps
trunk/test-suite/cases/semantic/00044/00044-plot.eps
trunk/test-suite/cases/semantic/00045/00045-plot.eps
trunk/test-suite/cases/semantic/00046/00046-plot.eps
trunk/test-suite/cases/semantic/00047/00047-plot.eps
trunk/test-suite/cases/semantic/00048/00048-plot.eps
trunk/test-suite/cases/semantic/00049/00049-plot.eps
trunk/test-suite/cases/semantic/00050/00050-plot.eps
trunk/test-suite/cases/semantic/00054/00054-plot.eps
trunk/test-suite/cases/semantic/00055/00055-plot.eps
trunk/test-suite/cases/semantic/00056/00056-plot.eps
trunk/test-suite/cases/semantic/00057/00057-plot.eps
trunk/test-suite/cases/semantic/00058/00058-plot.eps
trunk/test-suite/cases/semantic/00059/00059-plot.eps
trunk/test-suite/cases/semantic/00060/00060-plot.eps
trunk/test-suite/cases/semantic/00061/00061-plot.eps
trunk/test-suite/cases/semantic/00062/00062-plot.eps
trunk/test-suite/cases/semantic/00063/00063-plot.eps
trunk/test-suite/cases/semantic/00064/00064-plot.eps
trunk/test-suite/cases/semantic/00065/00065-plot.eps
trunk/test-suite/cases/semantic/00066/00066-plot.eps
trunk/test-suite/cases/semantic/00067/00067-plot.eps
trunk/test-suite/cases/semantic/00068/00068-plot.eps
trunk/test-suite/cases/semantic/00069/00069-plot.eps
trunk/test-suite/cases/semantic/00070/00070-plot.eps
trunk/test-suite/cases/semantic/00071/00071-plot.eps
trunk/test-suite/cases/semantic/00072/00072-plot.eps
trunk/test-suite/cases/semantic/00073/00073-plot.eps
trunk/test-suite/cases/semantic/00074/00074-plot.eps
trunk/test-suite/cases/semantic/00078/00078-plot.eps
trunk/test-suite/cases/semantic/00079/00079-plot.eps
trunk/test-suite/cases/semantic/00080/00080-plot.eps
trunk/test-suite/cases/semantic/00081/00081-plot.eps
trunk/test-suite/cases/semantic/00082/00082-plot.eps
trunk/test-suite/cases/semantic/00083/00083-plot.eps
trunk/test-suite/cases/semantic/00084/00084-plot.eps
trunk/test-suite/cases/semantic/00085/00085-plot.eps
trunk/test-suite/cases/semantic/00086/00086-plot.eps
trunk/test-suite/cases/semantic/00087/00087-plot.eps
trunk/test-suite/cases/semantic/00088/00088-plot.eps
trunk/test-suite/cases/semantic/00089/00089-plot.eps
trunk/test-suite/cases/semantic/00090/00090-plot.eps
trunk/test-suite/cases/semantic/00091/00091-plot.eps
trunk/test-suite/cases/semantic/00092/00092-plot.eps
trunk/test-suite/cases/semantic/00093/00093-plot.eps
trunk/test-suite/cases/semantic/00094/00094-plot.eps
trunk/test-suite/cases/semantic/00095/00095-plot.eps
trunk/test-suite/cases/semantic/00096/00096-plot.eps
trunk/test-suite/cases/semantic/00097/00097-plot.eps
trunk/test-suite/cases/semantic/00098/00098-plot.eps
trunk/test-suite/cases/semantic/00099/00099-plot.eps
trunk/test-suite/cases/semantic/00100/00100-plot.eps
trunk/test-suite/cases/semantic/00101/00101-plot.eps
trunk/test-suite/cases/semantic/00102/00102-plot.eps
trunk/test-suite/cases/semantic/00103/00103-plot.eps
trunk/test-suite/cases/semantic/00110/00110-plot.eps
trunk/test-suite/cases/semantic/00111/00111-plot.eps
trunk/test-suite/cases/semantic/00112/00112-plot.eps
trunk/test-suite/cases/semantic/00113/00113-plot.eps
trunk/test-suite/cases/semantic/00114/00114-plot.eps
trunk/test-suite/cases/semantic/00115/00115-plot.eps
trunk/test-suite/cases/semantic/00116/00116-plot.eps
trunk/test-suite/cases/semantic/00117/00117-plot.eps
trunk/test-suite/cases/semantic/00118/00118-plot.eps
trunk/test-suite/cases/semantic/00119/00119-plot.eps
trunk/test-suite/cases/semantic/00120/00120-plot.eps
trunk/test-suite/cases/semantic/00121/00121-plot.eps
trunk/test-suite/cases/semantic/00122/00122-plot.eps
trunk/test-suite/cases/semantic/00123/00123-plot.eps
trunk/test-suite/cases/semantic/00124/00124-plot.eps
trunk/test-suite/cases/semantic/00125/00125-plot.eps
trunk/test-suite/cases/semantic/00126/00126-plot.eps
trunk/test-suite/cases/semantic/00127/00127-plot.eps
trunk/test-suite/cases/semantic/00128/00128-plot.eps
trunk/test-suite/cases/semantic/00129/00129-plot.eps
trunk/test-suite/cases/semantic/00130/00130-plot.eps
trunk/test-suite/cases/semantic/00131/00131-plot.eps
trunk/test-suite/cases/semantic/00132/00132-plot.eps
trunk/test-suite/cases/semantic/00133/00133-plot.eps
trunk/test-suite/cases/semantic/00134/00134-plot.eps
trunk/test-suite/cases/semantic/00135/00135-plot.eps
trunk/test-suite/cases/semantic/00136/00136-plot.eps
trunk/test-suite/cases/semantic/00137/00137-plot.eps
trunk/test-suite/cases/semantic/00138/00138-plot.eps
trunk/test-suite/cases/semantic/00139/00139-plot.eps
trunk/test-suite/cases/semantic/00140/00140-plot.eps
trunk/test-suite/cases/semantic/00141/00141-plot.eps
trunk/test-suite/cases/semantic/00142/00142-plot.eps
trunk/test-suite/cases/semantic/00143/00143-plot.eps
trunk/test-suite/cases/semantic/00144/00144-plot.eps
trunk/test-suite/cases/semantic/00145/00145-plot.eps
trunk/test-suite/cases/semantic/00146/00146-plot.eps
trunk/test-suite/cases/semantic/00147/00147-plot.eps
trunk/test-suite/cases/semantic/00148/00148-plot.eps
trunk/test-suite/cases/semantic/00149/00149-plot.eps
trunk/test-suite/cases/semantic/00150/00150-plot.eps
trunk/test-suite/cases/semantic/00151/00151-plot.eps
trunk/test-suite/cases/semantic/00152/00152-plot.eps
trunk/test-suite/cases/semantic/00153/00153-plot.eps
trunk/test-suite/cases/semantic/00154/00154-plot.eps
trunk/test-suite/cases/semantic/00155/00155-plot.eps
trunk/test-suite/cases/semantic/00156/00156-plot.eps
trunk/test-suite/cases/semantic/00159/00159-plot.eps
trunk/test-suite/cases/semantic/00160/00160-plot.eps
trunk/test-suite/cases/semantic/00161/00161-plot.eps
trunk/test-suite/cases/semantic/00162/00162-plot.eps
trunk/test-suite/cases/semantic/00163/00163-plot.eps
trunk/test-suite/cases/semantic/00164/00164-plot.eps
trunk/test-suite/cases/semantic/00165/00165-plot.eps
trunk/test-suite/cases/semantic/00166/00166-plot.eps
trunk/test-suite/cases/semantic/00167/00167-plot.eps
trunk/test-suite/cases/semantic/00168/00168-plot.eps
trunk/test-suite/cases/semantic/00169/00169-plot.eps
trunk/test-suite/cases/semantic/00170/00170-plot.eps
trunk/test-suite/cases/semantic/00171/00171-plot.eps
trunk/test-suite/cases/semantic/00172/00172-plot.eps
trunk/test-suite/cases/semantic/00173/00173-plot.eps
trunk/test-suite/cases/semantic/00174/00174-plot.eps
trunk/test-suite/cases/semantic/00175/00175-plot.eps
trunk/test-suite/cases/semantic/00176/00176-plot.eps
trunk/test-suite/cases/semantic/00177/00177-plot.eps
trunk/test-suite/cases/semantic/00178/00178-plot.eps
trunk/test-suite/cases/semantic/00179/00179-plot.eps
trunk/test-suite/cases/semantic/00180/00180-plot.eps
trunk/test-suite/cases/semantic/00181/00181-plot.eps
trunk/test-suite/cases/semantic/00182/00182-plot.eps
trunk/test-suite/cases/semantic/00183/00183-plot.eps
trunk/test-suite/cases/semantic/00184/00184-plot.eps
trunk/test-suite/cases/semantic/00185/00185-plot.eps
trunk/test-suite/cases/semantic/00186/00186-plot.eps
trunk/test-suite/cases/semantic/00187/00187-plot.eps
trunk/test-suite/cases/semantic/00188/00188-plot.eps
trunk/test-suite/cases/semantic/00189/00189-plot.eps
trunk/test-suite/cases/semantic/00190/00190-plot.eps
trunk/test-suite/cases/semantic/00191/00191-plot.eps
trunk/test-suite/cases/semantic/00192/00192-plot.eps
trunk/test-suite/cases/semantic/00193/00193-plot.eps
trunk/test-suite/cases/semantic/00194/00194-plot.eps
trunk/test-suite/cases/semantic/00195/00195-plot.eps
trunk/test-suite/cases/semantic/00196/00196-plot.eps
trunk/test-suite/cases/semantic/00197/00197-plot.eps
trunk/test-suite/cases/semantic/00198/00198-plot.eps
trunk/test-suite/cases/semantic/00199/00199-plot.eps
trunk/test-suite/cases/semantic/00200/00200-plot.eps
trunk/test-suite/cases/semantic/00201/00201-plot.eps
trunk/test-suite/cases/semantic/00208/00208-plot.eps
trunk/test-suite/cases/semantic/00209/00209-plot.eps
trunk/test-suite/cases/semantic/00210/00210-plot.eps
trunk/test-suite/cases/semantic/00211/00211-plot.eps
trunk/test-suite/cases/semantic/00212/00212-plot.eps
trunk/test-suite/cases/semantic/00213/00213-plot.eps
trunk/test-suite/cases/semantic/00214/00214-plot.eps
trunk/test-suite/cases/semantic/00215/00215-plot.eps
trunk/test-suite/cases/semantic/00216/00216-plot.eps
trunk/test-suite/cases/semantic/00217/00217-plot.eps
trunk/test-suite/cases/semantic/00218/00218-plot.eps
trunk/test-suite/cases/semantic/00219/00219-plot.eps
trunk/test-suite/cases/semantic/00220/00220-plot.eps
trunk/test-suite/cases/semantic/00221/00221-plot.eps
trunk/test-suite/cases/semantic/00222/00222-plot.eps
trunk/test-suite/cases/semantic/00223/00223-plot.eps
trunk/test-suite/cases/semantic/00224/00224-plot.eps
trunk/test-suite/cases/semantic/00225/00225-plot.eps
trunk/test-suite/cases/semantic/00226/00226-plot.eps
trunk/test-suite/cases/semantic/00227/00227-plot.eps
trunk/test-suite/cases/semantic/00228/00228-plot.eps
trunk/test-suite/cases/semantic/00229/00229-plot.eps
trunk/test-suite/cases/semantic/00230/00230-plot.eps
trunk/test-suite/cases/semantic/00231/00231-plot.eps
trunk/test-suite/cases/semantic/00232/00232-plot.eps
trunk/test-suite/cases/semantic/00233/00233-plot.eps
trunk/test-suite/cases/semantic/00234/00234-plot.eps
trunk/test-suite/cases/semantic/00235/00235-plot.eps
trunk/test-suite/cases/semantic/00236/00236-plot.eps
trunk/test-suite/cases/semantic/00237/00237-plot.eps
trunk/test-suite/cases/semantic/00238/00238-plot.eps
trunk/test-suite/cases/semantic/00239/00239-plot.eps
trunk/test-suite/cases/semantic/00240/00240-plot.eps
trunk/test-suite/cases/semantic/00241/00241-plot.eps
trunk/test-suite/cases/semantic/00242/00242-plot.eps
trunk/test-suite/cases/semantic/00243/00243-plot.eps
trunk/test-suite/cases/semantic/00244/00244-plot.eps
trunk/test-suite/cases/semantic/00245/00245-plot.eps
trunk/test-suite/cases/semantic/00246/00246-plot.eps
trunk/test-suite/cases/semantic/00247/00247-plot.eps
trunk/test-suite/cases/semantic/00251/00251-plot.eps
trunk/test-suite/cases/semantic/00252/00252-plot.eps
trunk/test-suite/cases/semantic/00253/00253-plot.eps
trunk/test-suite/cases/semantic/00254/00254-plot.eps
trunk/test-suite/cases/semantic/00255/00255-plot.eps
trunk/test-suite/cases/semantic/00256/00256-plot.eps
trunk/test-suite/cases/semantic/00257/00257-plot.eps
trunk/test-suite/cases/semantic/00258/00258-plot.eps
trunk/test-suite/cases/semantic/00259/00259-plot.eps
trunk/test-suite/cases/semantic/00260/00260-plot.eps
trunk/test-suite/cases/semantic/00261/00261-plot.eps
trunk/test-suite/cases/semantic/00262/00262-plot.eps
trunk/test-suite/cases/semantic/00263/00263-plot.eps
trunk/test-suite/cases/semantic/00264/00264-plot.eps
trunk/test-suite/cases/semantic/00265/00265-plot.eps
trunk/test-suite/cases/semantic/00266/00266-plot.eps
trunk/test-suite/cases/semantic/00267/00267-plot.eps
trunk/test-suite/cases/semantic/00268/00268-plot.eps
trunk/test-suite/cases/semantic/00269/00269-plot.eps
trunk/test-suite/cases/semantic/00270/00270-plot.eps
trunk/test-suite/cases/semantic/00271/00271-plot.eps
trunk/test-suite/cases/semantic/00272/00272-plot.eps
trunk/test-suite/cases/semantic/00273/00273-plot.eps
trunk/test-suite/cases/semantic/00274/00274-plot.eps
trunk/test-suite/cases/semantic/00275/00275-plot.eps
trunk/test-suite/cases/semantic/00276/00276-plot.eps
trunk/test-suite/cases/semantic/00277/00277-plot.eps
trunk/test-suite/cases/semantic/00278/00278-plot.eps
trunk/test-suite/cases/semantic/00279/00279-plot.eps
trunk/test-suite/cases/semantic/00282/00282-plot.eps
trunk/test-suite/cases/semantic/00286/00286-plot.eps
trunk/test-suite/cases/semantic/00287/00287-plot.eps
trunk/test-suite/cases/semantic/00288/00288-plot.eps
trunk/test-suite/cases/semantic/00289/00289-plot.eps
trunk/test-suite/cases/semantic/00290/00290-plot.eps
trunk/test-suite/cases/semantic/00291/00291-plot.eps
trunk/test-suite/cases/semantic/00292/00292-plot.eps
trunk/test-suite/cases/semantic/00293/00293-plot.eps
trunk/test-suite/cases/semantic/00294/00294-plot.eps
trunk/test-suite/cases/semantic/00295/00295-plot.eps
trunk/test-suite/cases/semantic/00296/00296-plot.eps
trunk/test-suite/cases/semantic/00297/00297-plot.eps
trunk/test-suite/cases/semantic/00298/00298-plot.eps
trunk/test-suite/cases/semantic/00299/00299-plot.eps
trunk/test-suite/cases/semantic/00300/00300-plot.eps
trunk/test-suite/cases/semantic/00301/00301-plot.eps
trunk/test-suite/cases/semantic/00302/00302-plot.eps
trunk/test-suite/cases/semantic/00303/00303-plot.eps
trunk/test-suite/cases/semantic/00304/00304-plot.eps
trunk/test-suite/cases/semantic/00305/00305-plot.eps
trunk/test-suite/cases/semantic/00306/00306-plot.eps
trunk/test-suite/cases/semantic/00307/00307-plot.eps
trunk/test-suite/cases/semantic/00308/00308-plot.eps
trunk/test-suite/cases/semantic/00309/00309-plot.eps
trunk/test-suite/cases/semantic/00310/00310-plot.eps
trunk/test-suite/cases/semantic/00311/00311-plot.eps
trunk/test-suite/cases/semantic/00312/00312-plot.eps
trunk/test-suite/cases/semantic/00313/00313-plot.eps
trunk/test-suite/cases/semantic/00314/00314-plot.eps
trunk/test-suite/cases/semantic/00315/00315-plot.eps
trunk/test-suite/cases/semantic/00317/00317-plot.eps
trunk/test-suite/cases/semantic/00319/00319-plot.eps
trunk/test-suite/cases/semantic/00320/00320-plot.eps
trunk/test-suite/cases/semantic/00321/00321-plot.eps
trunk/test-suite/cases/semantic/00322/00322-plot.eps
trunk/test-suite/cases/semantic/00323/00323-plot.eps
trunk/test-suite/cases/semantic/00324/00324-plot.eps
trunk/test-suite/cases/semantic/00325/00325-plot.eps
trunk/test-suite/cases/semantic/00326/00326-plot.eps
trunk/test-suite/cases/semantic/00327/00327-plot.eps
trunk/test-suite/cases/semantic/00331/00331-plot.eps
trunk/test-suite/cases/semantic/00332/00332-plot.eps
trunk/test-suite/cases/semantic/00333/00333-plot.eps
trunk/test-suite/cases/semantic/00334/00334-plot.eps
trunk/test-suite/cases/semantic/00335/00335-plot.eps
trunk/test-suite/cases/semantic/00336/00336-plot.eps
trunk/test-suite/cases/semantic/00337/00337-plot.eps
trunk/test-suite/cases/semantic/00338/00338-plot.eps
trunk/test-suite/cases/semantic/00339/00339-plot.eps
trunk/test-suite/cases/semantic/00340/00340-plot.eps
trunk/test-suite/cases/semantic/00341/00341-plot.eps
trunk/test-suite/cases/semantic/00342/00342-plot.eps
trunk/test-suite/cases/semantic/00343/00343-plot.eps
trunk/test-suite/cases/semantic/00344/00344-plot.eps
trunk/test-suite/cases/semantic/00345/00345-plot.eps
trunk/test-suite/cases/semantic/00346/00346-plot.eps
trunk/test-suite/cases/semantic/00347/00347-plot.eps
trunk/test-suite/cases/semantic/00348/00348-plot.eps
trunk/test-suite/cases/semantic/00349/00349-plot.eps
trunk/test-suite/cases/semantic/00350/00350-plot.eps
trunk/test-suite/cases/semantic/00351/00351-plot.eps
trunk/test-suite/cases/semantic/00352/00352-plot.eps
trunk/test-suite/cases/semantic/00353/00353-plot.eps
trunk/test-suite/cases/semantic/00354/00354-plot.eps
trunk/test-suite/cases/semantic/00355/00355-plot.eps
trunk/test-suite/cases/semantic/00356/00356-plot.eps
trunk/test-suite/cases/semantic/00357/00357-plot.eps
trunk/test-suite/cases/semantic/00358/00358-plot.eps
trunk/test-suite/cases/semantic/00359/00359-plot.eps
trunk/test-suite/cases/semantic/00360/00360-plot.eps
trunk/test-suite/cases/semantic/00361/00361-plot.eps
trunk/test-suite/cases/semantic/00362/00362-plot.eps
trunk/test-suite/cases/semantic/00363/00363-plot.eps
trunk/test-suite/cases/semantic/00364/00364-plot.eps
trunk/test-suite/cases/semantic/00365/00365-plot.eps
trunk/test-suite/cases/semantic/00366/00366-plot.eps
trunk/test-suite/cases/semantic/00367/00367-plot.eps
trunk/test-suite/cases/semantic/00368/00368-plot.eps
trunk/test-suite/cases/semantic/00374/00374-plot.eps
trunk/test-suite/cases/semantic/00375/00375-plot.eps
trunk/test-suite/cases/semantic/00376/00376-plot.eps
trunk/test-suite/cases/semantic/00377/00377-plot.eps
trunk/test-suite/cases/semantic/00378/00378-plot.eps
trunk/test-suite/cases/semantic/00379/00379-plot.eps
trunk/test-suite/cases/semantic/00380/00380-plot.eps
trunk/test-suite/cases/semantic/00381/00381-plot.eps
trunk/test-suite/cases/semantic/00382/00382-plot.eps
trunk/test-suite/cases/semantic/00383/00383-plot.eps
trunk/test-suite/cases/semantic/00384/00384-plot.eps
trunk/test-suite/cases/semantic/00385/00385-plot.eps
trunk/test-suite/cases/semantic/00386/00386-plot.eps
trunk/test-suite/cases/semantic/00387/00387-plot.eps
trunk/test-suite/cases/semantic/00388/00388-plot.eps
trunk/test-suite/cases/semantic/00389/00389-plot.eps
trunk/test-suite/cases/semantic/00390/00390-plot.eps
trunk/test-suite/cases/semantic/00391/00391-plot.eps
trunk/test-suite/cases/semantic/00392/00392-plot.eps
trunk/test-suite/cases/semantic/00393/00393-plot.eps
trunk/test-suite/cases/semantic/00394/00394-plot.eps
trunk/test-suite/cases/semantic/00395/00395-plot.eps
trunk/test-suite/cases/semantic/00396/00396-plot.eps
trunk/test-suite/cases/semantic/00397/00397-plot.eps
trunk/test-suite/cases/semantic/00398/00398-plot.eps
trunk/test-suite/cases/semantic/00399/00399-plot.eps
trunk/test-suite/cases/semantic/00400/00400-plot.eps
trunk/test-suite/cases/semantic/00401/00401-plot.eps
trunk/test-suite/cases/semantic/00402/00402-plot.eps
trunk/test-suite/cases/semantic/00403/00403-plot.eps
trunk/test-suite/cases/semantic/00404/00404-plot.eps
trunk/test-suite/cases/semantic/00405/00405-plot.eps
trunk/test-suite/cases/semantic/00406/00406-plot.eps
trunk/test-suite/cases/semantic/00407/00407-plot.eps
trunk/test-suite/cases/semantic/00411/00411-plot.eps
trunk/test-suite/cases/semantic/00412/00412-plot.eps
trunk/test-suite/cases/semantic/00413/00413-plot.eps
trunk/test-suite/cases/semantic/00414/00414-plot.eps
trunk/test-suite/cases/semantic/00415/00415-plot.eps
trunk/test-suite/cases/semantic/00416/00416-plot.eps
trunk/test-suite/cases/semantic/00417/00417-plot.eps
trunk/test-suite/cases/semantic/00418/00418-plot.eps
trunk/test-suite/cases/semantic/00419/00419-plot.eps
trunk/test-suite/cases/semantic/00420/00420-plot.eps
trunk/test-suite/cases/semantic/00421/00421-plot.eps
trunk/test-suite/cases/semantic/00422/00422-plot.eps
trunk/test-suite/cases/semantic/00423/00423-plot.eps
trunk/test-suite/cases/semantic/00424/00424-plot.eps
trunk/test-suite/cases/semantic/00425/00425-plot.eps
trunk/test-suite/cases/semantic/00432/00432-plot.eps
trunk/test-suite/cases/semantic/00433/00433-plot.eps
trunk/test-suite/cases/semantic/00434/00434-plot.eps
trunk/test-suite/cases/semantic/00435/00435-plot.eps
trunk/test-suite/cases/semantic/00436/00436-plot.eps
trunk/test-suite/cases/semantic/00437/00437-plot.eps
trunk/test-suite/cases/semantic/00438/00438-plot.eps
trunk/test-suite/cases/semantic/00439/00439-plot.eps
trunk/test-suite/cases/semantic/00440/00440-plot.eps
trunk/test-suite/cases/semantic/00441/00441-plot.eps
trunk/test-suite/cases/semantic/00442/00442-plot.eps
trunk/test-suite/cases/semantic/00443/00443-plot.eps
trunk/test-suite/cases/semantic/00444/00444-plot.eps
trunk/test-suite/cases/semantic/00445/00445-plot.eps
trunk/test-suite/cases/semantic/00446/00446-plot.eps
trunk/test-suite/cases/semantic/00447/00447-plot.eps
trunk/test-suite/cases/semantic/00448/00448-plot.eps
trunk/test-suite/cases/semantic/00449/00449-plot.eps
trunk/test-suite/cases/semantic/00450/00450-plot.eps
trunk/test-suite/cases/semantic/00451/00451-plot.eps
trunk/test-suite/cases/semantic/00452/00452-plot.eps
trunk/test-suite/cases/semantic/00453/00453-plot.eps
trunk/test-suite/cases/semantic/00454/00454-plot.eps
trunk/test-suite/cases/semantic/00455/00455-plot.eps
trunk/test-suite/cases/semantic/00462/00462-plot.eps
trunk/test-suite/cases/semantic/00463/00463-plot.eps
trunk/test-suite/cases/semantic/00464/00464-plot.eps
trunk/test-suite/cases/semantic/00465/00465-plot.eps
trunk/test-suite/cases/semantic/00466/00466-plot.eps
trunk/test-suite/cases/semantic/00467/00467-plot.eps
trunk/test-suite/cases/semantic/00468/00468-plot.eps
trunk/test-suite/cases/semantic/00469/00469-plot.eps
trunk/test-suite/cases/semantic/00470/00470-plot.eps
trunk/test-suite/cases/semantic/00471/00471-plot.eps
trunk/test-suite/cases/semantic/00472/00472-plot.eps
trunk/test-suite/cases/semantic/00473/00473-plot.eps
trunk/test-suite/cases/semantic/00474/00474-plot.eps
trunk/test-suite/cases/semantic/00475/00475-plot.eps
trunk/test-suite/cases/semantic/00476/00476-plot.eps
trunk/test-suite/cases/semantic/00477/00477-plot.eps
trunk/test-suite/cases/semantic/00478/00478-plot.eps
trunk/test-suite/cases/semantic/00479/00479-plot.eps
trunk/test-suite/cases/semantic/00480/00480-plot.eps
trunk/test-suite/cases/semantic/00481/00481-plot.eps
trunk/test-suite/cases/semantic/00482/00482-plot.eps
trunk/test-suite/cases/semantic/00483/00483-plot.eps
trunk/test-suite/cases/semantic/00484/00484-plot.eps
trunk/test-suite/cases/semantic/00485/00485-plot.eps
trunk/test-suite/cases/semantic/00486/00486-plot.eps
trunk/test-suite/cases/semantic/00487/00487-plot.eps
trunk/test-suite/cases/semantic/00488/00488-plot.eps
trunk/test-suite/cases/semantic/00489/00489-plot.eps
trunk/test-suite/cases/semantic/00490/00490-plot.eps
trunk/test-suite/cases/semantic/00491/00491-plot.eps
trunk/test-suite/cases/semantic/00498/00498-plot.eps
trunk/test-suite/cases/semantic/00499/00499-plot.eps
trunk/test-suite/cases/semantic/00500/00500-plot.eps
trunk/test-suite/cases/semantic/00501/00501-plot.eps
trunk/test-suite/cases/semantic/00502/00502-plot.eps
trunk/test-suite/cases/semantic/00503/00503-plot.eps
trunk/test-suite/cases/semantic/00504/00504-plot.eps
trunk/test-suite/cases/semantic/00505/00505-plot.eps
trunk/test-suite/cases/semantic/00506/00506-plot.eps
trunk/test-suite/cases/semantic/00507/00507-plot.eps
trunk/test-suite/cases/semantic/00508/00508-plot.eps
trunk/test-suite/cases/semantic/00509/00509-plot.eps
trunk/test-suite/cases/semantic/00510/00510-plot.eps
trunk/test-suite/cases/semantic/00511/00511-plot.eps
trunk/test-suite/cases/semantic/00512/00512-plot.eps
trunk/test-suite/cases/semantic/00513/00513-plot.eps
trunk/test-suite/cases/semantic/00514/00514-plot.eps
trunk/test-suite/cases/semantic/00515/00515-plot.eps
trunk/test-suite/cases/semantic/00516/00516-plot.eps
trunk/test-suite/cases/semantic/00517/00517-plot.eps
trunk/test-suite/cases/semantic/00518/00518-plot.eps
trunk/test-suite/cases/semantic/00519/00519-plot.eps
trunk/test-suite/cases/semantic/00520/00520-plot.eps
trunk/test-suite/cases/semantic/00521/00521-plot.eps
trunk/test-suite/cases/semantic/00522/00522-plot.eps
trunk/test-suite/cases/semantic/00523/00523-plot.eps
trunk/test-suite/cases/semantic/00524/00524-plot.eps
trunk/test-suite/cases/semantic/00525/00525-plot.eps
trunk/test-suite/cases/semantic/00526/00526-plot.eps
trunk/test-suite/cases/semantic/00527/00527-plot.eps
trunk/test-suite/cases/semantic/00528/00528-plot.eps
trunk/test-suite/cases/semantic/00529/00529-plot.eps
trunk/test-suite/cases/semantic/00530/00530-plot.eps
trunk/test-suite/cases/semantic/00531/00531-plot.eps
trunk/test-suite/cases/semantic/00532/00532-plot.eps
trunk/test-suite/cases/semantic/00533/00533-plot.eps
trunk/test-suite/cases/semantic/00534/00534-plot.eps
trunk/test-suite/cases/semantic/00535/00535-plot.eps
trunk/test-suite/cases/semantic/00536/00536-plot.eps
trunk/test-suite/cases/semantic/00537/00537-plot.eps
trunk/test-suite/cases/semantic/00538/00538-plot.eps
trunk/test-suite/cases/semantic/00539/00539-plot.eps
trunk/test-suite/cases/semantic/00540/00540-plot.eps
trunk/test-suite/cases/semantic/00541/00541-plot.eps
trunk/test-suite/cases/semantic/00542/00542-plot.eps
trunk/test-suite/cases/semantic/00543/00543-plot.eps
trunk/test-suite/cases/semantic/00544/00544-plot.eps
trunk/test-suite/cases/semantic/00545/00545-plot.eps
trunk/test-suite/cases/semantic/00546/00546-plot.eps
trunk/test-suite/cases/semantic/00549/00549-plot.eps
trunk/test-suite/cases/semantic/00550/00550-plot.eps
trunk/test-suite/cases/semantic/00551/00551-plot.eps
trunk/test-suite/cases/semantic/00552/00552-plot.eps
trunk/test-suite/cases/semantic/00553/00553-plot.eps
trunk/test-suite/cases/semantic/00554/00554-plot.eps
trunk/test-suite/cases/semantic/00555/00555-plot.eps
trunk/test-suite/cases/semantic/00556/00556-plot.eps
trunk/test-suite/cases/semantic/00557/00557-plot.eps
trunk/test-suite/cases/semantic/00558/00558-plot.eps
trunk/test-suite/cases/semantic/00559/00559-plot.eps
trunk/test-suite/cases/semantic/00560/00560-plot.eps
trunk/test-suite/cases/semantic/00561/00561-plot.eps
trunk/test-suite/cases/semantic/00562/00562-plot.eps
trunk/test-suite/cases/semantic/00563/00563-plot.eps
trunk/test-suite/cases/semantic/00564/00564-plot.eps
trunk/test-suite/cases/semantic/00565/00565-plot.eps
trunk/test-suite/cases/semantic/00566/00566-plot.eps
trunk/test-suite/cases/semantic/00567/00567-plot.eps
trunk/test-suite/cases/semantic/00568/00568-plot.eps
trunk/test-suite/cases/semantic/00569/00569-plot.eps
trunk/test-suite/cases/semantic/00570/00570-plot.eps
trunk/test-suite/cases/semantic/00571/00571-plot.eps
trunk/test-suite/cases/semantic/00572/00572-plot.eps
trunk/test-suite/cases/semantic/00573/00573-plot.eps
trunk/test-suite/cases/semantic/00574/00574-plot.eps
trunk/test-suite/cases/semantic/00575/00575-plot.eps
trunk/test-suite/cases/semantic/00576/00576-plot.eps
trunk/test-suite/cases/semantic/00577/00577-plot.eps
trunk/test-suite/cases/semantic/00578/00578-plot.eps
trunk/test-suite/cases/semantic/00579/00579-plot.eps
trunk/test-suite/cases/semantic/00580/00580-plot.eps
trunk/test-suite/cases/semantic/00581/00581-plot.eps
trunk/test-suite/cases/semantic/00582/00582-plot.eps
trunk/test-suite/cases/semantic/00583/00583-plot.eps
trunk/test-suite/cases/semantic/00584/00584-plot.eps
trunk/test-suite/cases/semantic/00585/00585-plot.eps
trunk/test-suite/cases/semantic/00586/00586-plot.eps
trunk/test-suite/cases/semantic/00587/00587-plot.eps
trunk/test-suite/cases/semantic/00588/00588-plot.eps
trunk/test-suite/cases/semantic/00589/00589-plot.eps
trunk/test-suite/cases/semantic/00590/00590-plot.eps
trunk/test-suite/cases/semantic/00591/00591-plot.eps
trunk/test-suite/cases/semantic/00592/00592-plot.eps
trunk/test-suite/cases/semantic/00593/00593-plot.eps
trunk/test-suite/cases/semantic/00594/00594-plot.eps
trunk/test-suite/cases/semantic/00595/00595-plot.eps
trunk/test-suite/cases/semantic/00596/00596-plot.eps
trunk/test-suite/cases/semantic/00597/00597-plot.eps
trunk/test-suite/cases/semantic/00598/00598-plot.eps
trunk/test-suite/cases/semantic/00599/00599-plot.eps
trunk/test-suite/cases/semantic/00600/00600-plot.eps
trunk/test-suite/cases/semantic/00601/00601-plot.eps
trunk/test-suite/cases/semantic/00602/00602-plot.eps
trunk/test-suite/cases/semantic/00603/00603-plot.eps
trunk/test-suite/cases/semantic/00604/00604-plot.eps
trunk/test-suite/cases/semantic/00605/00605-plot.eps
trunk/test-suite/cases/semantic/00606/00606-plot.eps
trunk/test-suite/cases/semantic/00607/00607-plot.eps
trunk/test-suite/cases/semantic/00608/00608-plot.eps
trunk/test-suite/cases/semantic/00609/00609-plot.eps
trunk/test-suite/cases/semantic/00610/00610-plot.eps
trunk/test-suite/cases/semantic/00611/00611-plot.eps
trunk/test-suite/cases/semantic/00612/00612-plot.eps
trunk/test-suite/cases/semantic/00613/00613-plot.eps
trunk/test-suite/cases/semantic/00614/00614-plot.eps
trunk/test-suite/cases/semantic/00615/00615-plot.eps
trunk/test-suite/cases/semantic/00616/00616-plot.eps
trunk/test-suite/cases/semantic/00617/00617-plot.eps
trunk/test-suite/cases/semantic/00618/00618-plot.eps
trunk/test-suite/cases/semantic/00619/00619-plot.eps
trunk/test-suite/cases/semantic/00620/00620-plot.eps
trunk/test-suite/cases/semantic/00621/00621-plot.eps
trunk/test-suite/cases/semantic/00622/00622-plot.eps
trunk/test-suite/cases/semantic/00623/00623-plot.eps
trunk/test-suite/cases/semantic/00624/00624-plot.eps
trunk/test-suite/cases/semantic/00625/00625-plot.eps
trunk/test-suite/cases/semantic/00626/00626-plot.eps
trunk/test-suite/cases/semantic/00627/00627-plot.eps
trunk/test-suite/cases/semantic/00628/00628-plot.eps
trunk/test-suite/cases/semantic/00629/00629-plot.eps
trunk/test-suite/cases/semantic/00630/00630-plot.eps
trunk/test-suite/cases/semantic/00631/00631-plot.eps
trunk/test-suite/cases/semantic/00632/00632-plot.eps
trunk/test-suite/cases/semantic/00633/00633-plot.eps
trunk/test-suite/cases/semantic/00634/00634-plot.eps
trunk/test-suite/cases/semantic/00635/00635-plot.eps
trunk/test-suite/cases/semantic/00636/00636-plot.eps
trunk/test-suite/cases/semantic/00637/00637-plot.eps
trunk/test-suite/cases/semantic/00638/00638-plot.eps
trunk/test-suite/cases/semantic/00639/00639-plot.eps
trunk/test-suite/cases/semantic/00640/00640-plot.eps
trunk/test-suite/cases/semantic/00641/00641-plot.eps
trunk/test-suite/cases/semantic/00642/00642-plot.eps
trunk/test-suite/cases/semantic/00643/00643-plot.eps
trunk/test-suite/cases/semantic/00644/00644-plot.eps
trunk/test-suite/cases/semantic/00645/00645-plot.eps
trunk/test-suite/cases/semantic/00646/00646-plot.eps
trunk/test-suite/cases/semantic/00647/00647-plot.eps
trunk/test-suite/cases/semantic/00648/00648-plot.eps
trunk/test-suite/cases/semantic/00649/00649-plot.eps
trunk/test-suite/cases/semantic/00650/00650-plot.eps
trunk/test-suite/cases/semantic/00651/00651-plot.eps
trunk/test-suite/cases/semantic/00652/00652-plot.eps
trunk/test-suite/cases/semantic/00653/00653-plot.eps
trunk/test-suite/cases/semantic/00654/00654-plot.eps
trunk/test-suite/cases/semantic/00655/00655-plot.eps
trunk/test-suite/cases/semantic/00656/00656-plot.eps
trunk/test-suite/cases/semantic/00657/00657-plot.eps
trunk/test-suite/cases/semantic/00658/00658-plot.eps
trunk/test-suite/cases/semantic/00659/00659-plot.eps
trunk/test-suite/cases/semantic/00660/00660-plot.eps
trunk/test-suite/cases/semantic/00661/00661-plot.eps
trunk/test-suite/cases/semantic/00662/00662-plot.eps
trunk/test-suite/cases/semantic/00663/00663-plot.eps
trunk/test-suite/cases/semantic/00665/00665-plot.eps
trunk/test-suite/cases/semantic/00666/00666-plot.eps
trunk/test-suite/cases/semantic/00685/00685-plot.eps
trunk/test-suite/cases/semantic/00687/00687-plot.eps
trunk/test-suite/cases/semantic/00689/00689-plot.eps
trunk/test-suite/cases/semantic/00690/00690-plot.eps
trunk/test-suite/cases/semantic/00691/00691-plot.eps
trunk/test-suite/cases/semantic/00692/00692-plot.eps
trunk/test-suite/cases/semantic/00693/00693-plot.eps
trunk/test-suite/cases/semantic/00694/00694-plot.eps
trunk/test-suite/cases/semantic/00695/00695-plot.eps
trunk/test-suite/cases/semantic/00696/00696-plot.eps
trunk/test-suite/cases/semantic/00697/00697-plot.eps
trunk/test-suite/cases/semantic/00698/00698-plot.eps
trunk/test-suite/cases/semantic/00699/00699-plot.eps
trunk/test-suite/cases/semantic/00700/00700-plot.eps
trunk/test-suite/cases/semantic/00701/00701-plot.eps
trunk/test-suite/cases/semantic/00702/00702-plot.eps
trunk/test-suite/cases/semantic/00703/00703-plot.eps
trunk/test-suite/cases/semantic/00704/00704-plot.eps
trunk/test-suite/cases/semantic/00705/00705-plot.eps
trunk/test-suite/cases/semantic/00706/00706-plot.eps
trunk/test-suite/cases/semantic/00707/00707-plot.eps
trunk/test-suite/cases/semantic/00708/00708-plot.eps
trunk/test-suite/cases/semantic/00709/00709-plot.eps
trunk/test-suite/cases/semantic/00710/00710-plot.eps
trunk/test-suite/cases/semantic/00717/00717-plot.eps
trunk/test-suite/cases/semantic/00718/00718-plot.eps
trunk/test-suite/cases/semantic/00719/00719-plot.eps
trunk/test-suite/cases/semantic/00720/00720-plot.eps
trunk/test-suite/cases/semantic/00721/00721-plot.eps
trunk/test-suite/cases/semantic/00722/00722-plot.eps
trunk/test-suite/cases/semantic/00723/00723-plot.eps
trunk/test-suite/cases/semantic/00724/00724-plot.eps
trunk/test-suite/cases/semantic/00725/00725-plot.eps
trunk/test-suite/cases/semantic/00726/00726-plot.eps
trunk/test-suite/cases/semantic/00727/00727-plot.eps
trunk/test-suite/cases/semantic/00728/00728-plot.eps
trunk/test-suite/cases/semantic/00729/00729-plot.eps
trunk/test-suite/cases/semantic/00730/00730-plot.eps
trunk/test-suite/cases/semantic/00731/00731-plot.eps
trunk/test-suite/cases/semantic/00732/00732-plot.eps
trunk/test-suite/cases/semantic/00733/00733-plot.eps
trunk/test-suite/cases/semantic/00734/00734-plot.eps
trunk/test-suite/cases/semantic/00735/00735-plot.eps
trunk/test-suite/cases/semantic/00736/00736-plot.eps
trunk/test-suite/cases/semantic/00737/00737-plot.eps
trunk/test-suite/cases/semantic/00738/00738-plot.eps
trunk/test-suite/cases/semantic/00739/00739-plot.eps
trunk/test-suite/cases/semantic/00740/00740-plot.eps
trunk/test-suite/cases/semantic/00741/00741-plot.eps
trunk/test-suite/cases/semantic/00742/00742-plot.eps
trunk/test-suite/cases/semantic/00743/00743-plot.eps
trunk/test-suite/cases/semantic/00744/00744-plot.eps
trunk/test-suite/cases/semantic/00745/00745-plot.eps
trunk/test-suite/cases/semantic/00746/00746-plot.eps
trunk/test-suite/cases/semantic/00747/00747-plot.eps
trunk/test-suite/cases/semantic/00748/00748-plot.eps
trunk/test-suite/cases/semantic/00749/00749-plot.eps
trunk/test-suite/cases/semantic/00750/00750-plot.eps
trunk/test-suite/cases/semantic/00751/00751-plot.eps
trunk/test-suite/cases/semantic/00752/00752-plot.eps
trunk/test-suite/cases/semantic/00753/00753-plot.eps
trunk/test-suite/cases/semantic/00754/00754-plot.eps
trunk/test-suite/cases/semantic/00755/00755-plot.eps
trunk/test-suite/cases/semantic/00756/00756-plot.eps
trunk/test-suite/cases/semantic/00757/00757-plot.eps
trunk/test-suite/cases/semantic/00758/00758-plot.eps
trunk/test-suite/cases/semantic/00759/00759-plot.eps
trunk/test-suite/cases/semantic/00760/00760-plot.eps
trunk/test-suite/cases/semantic/00761/00761-plot.eps
trunk/test-suite/cases/semantic/00762/00762-plot.eps
trunk/test-suite/cases/semantic/00763/00763-plot.eps
trunk/test-suite/cases/semantic/00764/00764-plot.eps
trunk/test-suite/cases/semantic/00765/00765-plot.eps
trunk/test-suite/cases/semantic/00766/00766-plot.eps
trunk/test-suite/cases/semantic/00767/00767-plot.eps
trunk/test-suite/cases/semantic/00768/00768-plot.eps
trunk/test-suite/cases/semantic/00769/00769-plot.eps
trunk/test-suite/cases/semantic/00770/00770-plot.eps
trunk/test-suite/cases/semantic/00771/00771-plot.eps
trunk/test-suite/cases/semantic/00772/00772-plot.eps
trunk/test-suite/cases/semantic/00773/00773-plot.eps
trunk/test-suite/cases/semantic/00774/00774-plot.eps
trunk/test-suite/cases/semantic/00775/00775-plot.eps
trunk/test-suite/cases/semantic/00776/00776-plot.eps
trunk/test-suite/cases/semantic/00777/00777-plot.eps
trunk/test-suite/cases/semantic/00778/00778-plot.eps
trunk/test-suite/cases/semantic/00779/00779-plot.eps
trunk/test-suite/cases/semantic/00780/00780-plot.eps
trunk/test-suite/cases/semantic/00781/00781-plot.eps
trunk/test-suite/cases/semantic/00782/00782-plot.eps
trunk/test-suite/cases/semantic/00783/00783-plot.eps
trunk/test-suite/cases/semantic/00784/00784-plot.eps
trunk/test-suite/cases/semantic/00785/00785-plot.eps
trunk/test-suite/cases/semantic/00786/00786-plot.eps
trunk/test-suite/cases/semantic/00787/00787-plot.eps
trunk/test-suite/cases/semantic/00788/00788-plot.eps
trunk/test-suite/cases/semantic/00789/00789-plot.eps
trunk/test-suite/cases/semantic/00790/00790-plot.eps
trunk/test-suite/cases/semantic/00791/00791-plot.eps
trunk/test-suite/cases/semantic/00792/00792-plot.eps
trunk/test-suite/cases/semantic/00793/00793-plot.eps
trunk/test-suite/cases/semantic/00794/00794-plot.eps
trunk/test-suite/cases/semantic/00795/00795-plot.eps
trunk/test-suite/cases/semantic/00796/00796-plot.eps
trunk/test-suite/cases/semantic/00797/00797-plot.eps
trunk/test-suite/cases/semantic/00798/00798-plot.eps
trunk/test-suite/cases/semantic/00799/00799-plot.eps
trunk/test-suite/cases/semantic/00800/00800-plot.eps
trunk/test-suite/cases/semantic/00801/00801-plot.eps
trunk/test-suite/cases/semantic/00802/00802-plot.eps
trunk/test-suite/cases/semantic/00803/00803-plot.eps
trunk/test-suite/cases/semantic/00804/00804-plot.eps
trunk/test-suite/cases/semantic/00805/00805-plot.eps
trunk/test-suite/cases/semantic/00806/00806-plot.eps
trunk/test-suite/cases/semantic/00807/00807-plot.eps
trunk/test-suite/cases/semantic/00808/00808-plot.eps
trunk/test-suite/cases/semantic/00809/00809-plot.eps
trunk/test-suite/cases/semantic/00810/00810-plot.eps
trunk/test-suite/cases/semantic/00811/00811-plot.eps
trunk/test-suite/cases/semantic/00812/00812-plot.eps
trunk/test-suite/cases/semantic/00813/00813-plot.eps
trunk/test-suite/cases/semantic/00814/00814-plot.eps
trunk/test-suite/cases/semantic/00815/00815-plot.eps
trunk/test-suite/cases/semantic/00816/00816-plot.eps
trunk/test-suite/cases/semantic/00817/00817-plot.eps
trunk/test-suite/cases/semantic/00818/00818-plot.eps
trunk/test-suite/cases/semantic/00819/00819-plot.eps
trunk/test-suite/cases/semantic/00820/00820-plot.eps
trunk/test-suite/cases/semantic/00821/00821-plot.eps
trunk/test-suite/cases/semantic/00822/00822-plot.eps
trunk/test-suite/cases/semantic/00823/00823-plot.eps
trunk/test-suite/cases/semantic/00824/00824-plot.eps
trunk/test-suite/cases/semantic/00825/00825-plot.eps
trunk/test-suite/cases/semantic/00826/00826-plot.eps
trunk/test-suite/cases/semantic/00827/00827-plot.eps
trunk/test-suite/cases/semantic/00828/00828-plot.eps
trunk/test-suite/cases/semantic/00829/00829-plot.eps
trunk/test-suite/cases/semantic/00830/00830-plot.eps
trunk/test-suite/cases/semantic/00831/00831-plot.eps
trunk/test-suite/cases/semantic/00832/00832-plot.eps
trunk/test-suite/cases/semantic/00833/00833-plot.eps
trunk/test-suite/cases/semantic/00834/00834-plot.eps
trunk/test-suite/cases/semantic/00835/00835-plot.eps
trunk/test-suite/cases/semantic/00836/00836-plot.eps
trunk/test-suite/cases/semantic/00837/00837-plot.eps
trunk/test-suite/cases/semantic/00838/00838-plot.eps
trunk/test-suite/cases/semantic/00839/00839-plot.eps
trunk/test-suite/cases/semantic/00840/00840-plot.eps
trunk/test-suite/cases/semantic/00841/00841-plot.eps
trunk/test-suite/cases/semantic/00842/00842-plot.eps
trunk/test-suite/cases/semantic/00843/00843-plot.eps
trunk/test-suite/cases/semantic/00844/00844-plot.eps
trunk/test-suite/cases/semantic/00845/00845-plot.eps
trunk/test-suite/cases/semantic/00846/00846-plot.eps
trunk/test-suite/cases/semantic/00847/00847-plot.eps
trunk/test-suite/cases/semantic/00848/00848-plot.eps
trunk/test-suite/cases/semantic/00849/00849-plot.eps
trunk/test-suite/cases/semantic/00850/00850-plot.eps
trunk/test-suite/cases/semantic/00851/00851-plot.eps
trunk/test-suite/cases/semantic/00852/00852-plot.eps
trunk/test-suite/cases/semantic/00853/00853-plot.eps
trunk/test-suite/cases/semantic/00854/00854-plot.eps
trunk/test-suite/cases/semantic/00855/00855-plot.eps
trunk/test-suite/cases/semantic/00856/00856-plot.eps
trunk/test-suite/cases/semantic/00857/00857-plot.eps
trunk/test-suite/cases/semantic/00858/00858-plot.eps
trunk/test-suite/cases/semantic/00859/00859-plot.eps
trunk/test-suite/cases/semantic/00860/00860-plot.eps
trunk/test-suite/cases/semantic/00861/00861-plot.eps
trunk/test-suite/cases/semantic/00862/00862-plot.eps
trunk/test-suite/cases/semantic/00863/00863-plot.eps
trunk/test-suite/cases/semantic/00864/00864-plot.eps
trunk/test-suite/cases/semantic/00865/00865-plot.eps
trunk/test-suite/cases/semantic/00866/00866-plot.eps
trunk/test-suite/cases/semantic/00867/00867-plot.eps
trunk/test-suite/cases/semantic/00868/00868-plot.eps
trunk/test-suite/cases/semantic/00869/00869-plot.eps
trunk/test-suite/cases/semantic/00876/00876-plot.eps
trunk/test-suite/cases/semantic/00877/00877-plot.eps
trunk/test-suite/cases/semantic/00878/00878-plot.eps
trunk/test-suite/cases/semantic/00879/00879-plot.eps
trunk/test-suite/cases/semantic/00880/00880-plot.eps
trunk/test-suite/cases/semantic/00881/00881-plot.eps
trunk/test-suite/cases/semantic/00882/00882-plot.eps
trunk/test-suite/cases/semantic/00883/00883-plot.eps
trunk/test-suite/cases/semantic/00884/00884-plot.eps
trunk/test-suite/cases/semantic/00885/00885-plot.eps
trunk/test-suite/cases/semantic/00886/00886-plot.eps
trunk/test-suite/cases/semantic/00887/00887-plot.eps
trunk/test-suite/cases/semantic/00888/00888-plot.eps
trunk/test-suite/cases/semantic/00889/00889-plot.eps
trunk/test-suite/cases/semantic/00890/00890-plot.eps
trunk/test-suite/cases/semantic/00891/00891-plot.eps
trunk/test-suite/cases/semantic/00892/00892-plot.eps
trunk/test-suite/cases/semantic/00893/00893-plot.eps
trunk/test-suite/cases/semantic/00894/00894-plot.eps
trunk/test-suite/cases/semantic/00895/00895-plot.eps
trunk/test-suite/cases/semantic/00896/00896-plot.eps
trunk/test-suite/cases/semantic/00897/00897-plot.eps
trunk/test-suite/cases/semantic/00898/00898-plot.eps
trunk/test-suite/cases/semantic/00899/00899-plot.eps
trunk/test-suite/cases/semantic/00900/00900-plot.eps
Deleted: trunk/test-suite/cases/semantic/00001/00001-plot.eps
===================================================================
--- trunk/test-suite/cases/semantic/00001/00001-plot.eps 2009-03-23 07:51:36 UTC (rev 9416)
+++ trunk/test-suite/cases/semantic/00001/00001-plot.eps 2009-03-23 15:14:18 UTC (rev 9417)
@@ -1,2033 +0,0 @@
-%!PS-Adobe-2.0 EPSF-1.2
-%%BoundingBox: 88 4 376 144
-%%HiResBoundingBox: 88 4 376 143.562
-%%Creator: (Mathematica 5.2 for X)
-%%CreationDate: (Friday, August 17, 2007) (17:26:26)
-%%Title: Clipboard
-%%DocumentNeededResources: font Math1Mono
-%%+ font Courier
-%%DocumentSuppliedResources:
-%%DocumentNeededFonts: Math1Mono
-%%+ Courier
-%%DocumentSuppliedFonts:
-%%DocumentFonts: Math1Mono
-%%+ Courier
-%%EndComments
-0 147.562 translate 1 -1 scale
-150 dict begin
-/Mfixwid true def
-/Mrot 0 def
-/Mpstart {
- MathPictureStart
-} bind def
-/Mpend {
- MathPictureEnd
-} bind def
-/Mscale {
- 0 1 0 1
- 5 -1 roll
- MathScale
-} bind def
-/Plain /Courier findfont def
-/Bold /Courier-Bold findfont def
-/Italic /Courier-Oblique findfont def
-/MathPictureStart {
- /Mimatrix
- matrix currentmatrix
- def
- gsave
- newpath
- Mleft
- Mbottom
- translate
- /Mtmatrix
- matrix currentmatrix
- def
- Plain
- Mfontsize scalefont
- setfont
- 0 setgray
- 0 setlinewidth
-} bind def
-/MathPictureEnd {
- grestore
-} bind def
-/MathSubStart {
- Momatrix
- Mgmatrix Mtmatrix
- Mleft Mbottom
- Mwidth Mheight
- 9 -2 roll
- moveto
- Mtmatrix setmatrix
- currentpoint
- Mgmatrix setmatrix
- 11 -2 roll
- moveto
- Mtmatrix setmatrix
- currentpoint
- 2 copy translate
- /Mtmatrix matrix currentmatrix def
- /Mleft 0 def
- /Mbottom 0 def
- 3 -1 roll
- exch sub
- /Mheight exch def
- sub
- /Mwidth exch def
-} bind def
-/MathSubEnd {
- /Mheight exch def
- /Mwidth exch def
- /Mbottom exch def
- /Mleft exch def
- /Mtmatrix exch def
- dup setmatrix
- /Mgmatrix exch def
- /Momatrix exch def
-} bind def
-/Mdot {
- moveto
- 0 0 rlineto
- stroke
-} bind def
-/Mtetra {
- moveto
- lineto
- lineto
- lineto
- fill
-} bind def
-/Metetra {
- moveto
- lineto
- lineto
- lineto
- closepath
- gsave
- fill
- grestore
- 0 setgray
- stroke
-} bind def
-/Mistroke {
- flattenpath
- 0 0 0
- {
- 4 2 roll
- pop pop
- }
- {
- 4 -1 roll
- 2 index
- sub dup mul
- 4 -1 roll
- 2 index
- sub dup mul
- add sqrt
- 4 -1 roll
- add
- 3 1 roll
- }
- {
- stop
- }
- {
- stop
- }
- pathforall
- pop pop
- currentpoint
- stroke
- moveto
- currentdash
- 3 -1 roll
- add
- setdash
-} bind def
-/Mfstroke {
- stroke
- currentdash
- pop 0
- setdash
-} bind def
-/Mrotsboxa {
- gsave
- dup
- /Mrot
- exch def
- Mrotcheck
- Mtmatrix
- dup
- setmatrix
- 7 1 roll
- 4 index
- 4 index
- translate
- rotate
- 3 index
- -1 mul
- 3 index
- -1 mul
- translate
- /Mtmatrix
- matrix
- currentmatrix
- def
- grestore
- Msboxa
- 3 -1 roll
- /Mtmatrix
- exch def
- /Mrot
- 0 def
-} bind def
-/Msboxa {
- newpath
- 5 -1 roll
- Mvboxa
- pop
- Mboxout
- 6 -1 roll
- 5 -1 roll
- 4 -1 roll
- Msboxa1
- 5 -3 roll
- Msboxa1
- Mboxrot
- [
- 7 -2 roll
- 2 copy
- [
- 3 1 roll
- 10 -1 roll
- 9 -1 roll
- ]
- 6 1 roll
- 5 -2 roll
- ]
-} bind def
-/Msboxa1 {
- sub
- 2 div
- dup
- 2 index
- 1 add
- mul
- 3 -1 roll
- -1 add
- 3 -1 roll
- mul
-} bind def
-/Mvboxa {
- Mfixwid
- {
- Mvboxa1
- }
- {
- dup
- Mwidthcal
- 0 exch
- {
- add
- }
- forall
- exch
- Mvboxa1
- 4 index
- 7 -1 roll
- add
- 4 -1 roll
- pop
- 3 1 roll
- }
- ifelse
-} bind def
-/Mvboxa1 {
- gsave
- newpath
- [ true
- 3 -1 roll
- {
- Mbbox
- 5 -1 roll
- {
- 0
- 5 1 roll
- }
- {
- 7 -1 roll
- exch sub
- (m) stringwidth pop
- .3 mul
- sub
- 7 1 roll
- 6 -1 roll
- 4 -1 roll
- Mmin
- 3 -1 roll
- 5 index
- add
- 5 -1 roll
- 4 -1 roll
- Mmax
- 4 -1 roll
- }
- ifelse
- false
- }
- forall
- { stop } if
- counttomark
- 1 add
- 4 roll
- ]
- grestore
-} bind def
-/Mbbox {
- 0 0 moveto
- false charpath
- flattenpath
- pathbbox
- newpath
-} bind def
-/Mmin {
- 2 copy
- gt
- { exch } if
- pop
-} bind def
-/Mmax {
- 2 copy
- lt
- { exch } if
- pop
-} bind def
-/Mrotshowa {
- dup
- /Mrot
- exch def
- Mrotcheck
- Mtmatrix
- dup
- setmatrix
- 7 1 roll
- 4 index
- 4 index
- translate
- rotate
- 3 index
- -1 mul
- 3 index
- -1 mul
- translate
- /Mtmatrix
- matrix
- currentmatrix
- def
- Mgmatrix setmatrix
- Mshowa
- /Mtmatrix
- exch def
- /Mrot 0 def
-} bind def
-/Mshowa {
- 4 -2 roll
- moveto
- 2 index
- Mtmatrix setmatrix
- Mvboxa
- 7 1 roll
- Mboxout
- 6 -1 roll
- 5 -1 roll
- 4 -1 roll
- Mshowa1
- 4 1 roll
- Mshowa1
- rmoveto
- currentpoint
- Mfixwid
- {
- Mshowax
- }
- {
- Mshoway
- }
- ifelse
- pop pop pop pop
- Mgmatrix setmatrix
-} bind def
-/Mshowax {
- 0 1
- 4 index length
- -1 add
- {
- 2 index
- 4 index
- 2 index
- get
- 3 index
- add
- moveto
- 4 index
- exch get
- show
- } for
-} bind def
-/Mshoway {
- 3 index
- Mwidthcal
- 5 1 roll
- 0 1
- 4 index length
- -1 add
- {
- 2 index
- 4 index
- 2 index
- get
- 3 index
- add
- moveto
- 4 index
- exch get
- [
- 6 index
- aload
- length
- 2 add
- -1 roll
- {
- pop
- Strform
- stringwidth
- pop
- neg
- exch
- add
- 0 rmoveto
- }
- exch
- kshow
- cleartomark
- } for
- pop
-} bind def
-/Mwidthcal {
- [
- exch
- {
- Mwidthcal1
- }
- forall
- ]
- [
- exch
- dup
- Maxlen
- -1 add
- 0 1
- 3 -1 roll
- {
- [
- exch
- 2 index
- {
- 1 index
- Mget
- exch
- }
- forall
- pop
- Maxget
- exch
- }
- for
- pop
- ]
- Mreva
-} bind def
-/Mreva {
- [
- exch
- aload
- length
- -1 1
- {1 roll}
- for
- ]
-} bind def
-/Mget {
- 1 index
- length
- -1 add
- 1 index
- ge
- {
- get
- }
- {
- pop pop
- 0
- }
- ifelse
-} bind def
-/Maxlen {
- [
- exch
- {
- length
- }
- forall
- Maxget
-} bind def
-/Maxget {
- counttomark
- -1 add
- 1 1
- 3 -1 roll
- {
- pop
- Mmax
- }
- for
- exch
- pop
-} bind def
-/Mwidthcal1 {
- [
- exch
- {
- Strform
- stringwidth
- pop
- }
- forall
- ]
-} bind def
-/Strform {
- /tem (x) def
- tem 0
- 3 -1 roll
- put
- tem
-} bind def
-/Mshowa1 {
- 2 copy
- add
- 4 1 roll
- sub
- mul
- sub
- -2 div
-} bind def
-/MathScale {
- Mwidth
- Mheight
- Mlp
- translate
- scale
- /yscale exch def
- /ybias exch def
- /xscale exch def
- /xbias exch def
- /Momatrix
- xscale yscale matrix scale
- xbias ybias matrix translate
- matrix concatmatrix def
- /Mgmatrix
- matrix currentmatrix
- def
-} bind def
-/Mlp {
- 3 copy
- Mlpfirst
- {
- Mnodistort
- {
- Mmin
- dup
- } if
- 4 index
- 2 index
- 2 index
- Mlprun
- 11 index
- 11 -1 roll
- 10 -4 roll
- Mlp1
- 8 index
- 9 -5 roll
- Mlp1
- 4 -1 roll
- and
- { exit } if
- 3 -1 roll
- pop pop
- } loop
- exch
- 3 1 roll
- 7 -3 roll
- pop pop pop
-} bind def
-/Mlpfirst {
- 3 -1 roll
- dup length
- 2 copy
- -2 add
- get
- aload
- pop pop pop
- 4 -2 roll
- -1 add
- get
- aload
- pop pop pop
- 6 -1 roll
- 3 -1 roll
- 5 -1 roll
- sub
- dup /MsaveAx exch def
- div
- 4 1 roll
- exch sub
- dup /MsaveAy exch def
- div
-} bind def
-/Mlprun {
- 2 copy
- 4 index
- 0 get
- dup
- 4 1 roll
- Mlprun1
- 3 copy
- 8 -2 roll
- 9 -1 roll
- {
- 3 copy
- Mlprun1
- 3 copy
- 11 -3 roll
- /gt Mlpminmax
- 8 3 roll
- 11 -3 roll
- /lt Mlpminmax
- 8 3 roll
- } forall
- pop pop pop pop
- 3 1 roll
- pop pop
- aload pop
- 5 -1 roll
- aload pop
- exch
- 6 -1 roll
- Mlprun2
- 8 2 roll
- 4 -1 roll
- Mlprun2
- 6 2 roll
- 3 -1 roll
- Mlprun2
- 4 2 roll
- exch
- Mlprun2
- 6 2 roll
-} bind def
-/Mlprun1 {
- aload pop
- exch
- 6 -1 roll
- 5 -1 roll
- mul add
- 4 -2 roll
- mul
- 3 -1 roll
- add
-} bind def
-/Mlprun2 {
- 2 copy
- add 2 div
- 3 1 roll
- exch sub
-} bind def
-/Mlpminmax {
- cvx
- 2 index
- 6 index
- 2 index
- exec
- {
- 7 -3 roll
- 4 -1 roll
- } if
- 1 index
- 5 index
- 3 -1 roll
- exec
- {
- 4 1 roll
- pop
- 5 -1 roll
- aload
- pop pop
- 4 -1 roll
- aload pop
- [
- 8 -2 roll
- pop
- 5 -2 roll
- pop
- 6 -2 roll
- pop
- 5 -1 roll
- ]
- 4 1 roll
- pop
- }
- {
- pop pop pop
- } ifelse
-} bind def
-/Mlp1 {
- 5 index
- 3 index sub
- 5 index
- 2 index mul
- 1 index
- le
- 1 index
- 0 le
- or
- dup
- not
- {
- 1 index
- 3 index div
- .99999 mul
- 8 -1 roll
- pop
- 7 1 roll
- }
- if
- 8 -1 roll
- 2 div
- 7 -2 roll
- pop sub
- 5 index
- 6 -3 roll
- pop pop
- mul sub
- exch
-} bind def
-/intop 0 def
-/inrht 0 def
-/inflag 0 def
-/outflag 0 def
-/xadrht 0 def
-/xadlft 0 def
-/yadtop 0 def
-/yadbot 0 def
-/Minner {
- outflag
- 1
- eq
- {
- /outflag 0 def
- /intop 0 def
- /inrht 0 def
- } if
- 5 index
- gsave
- Mtmatrix setmatrix
- Mvboxa pop
- grestore
- 3 -1 roll
- pop
- dup
- intop
- gt
- {
- /intop
- exch def
- }
- { pop }
- ifelse
- dup
- inrht
- gt
- {
- /inrht
- exch def
- }
- { pop }
- ifelse
- pop
- /inflag
- 1 def
-} bind def
-/Mouter {
- /xadrht 0 def
- /xadlft 0 def
- /yadtop 0 def
- /yadbot 0 def
- inflag
- 1 eq
- {
- dup
- 0 lt
- {
- dup
- intop
- mul
- neg
- /yadtop
- exch def
- } if
- dup
- 0 gt
- {
- dup
- intop
- mul
- /yadbot
- exch def
- }
- if
- pop
- dup
- 0 lt
- {
- dup
- inrht
- mul
- neg
- /xadrht
- exch def
- } if
- dup
- 0 gt
- {
- dup
- inrht
- mul
- /xadlft
- exch def
- } if
- pop
- /outflag 1 def
- }
- { pop pop}
- ifelse
- /inflag 0 def
- /inrht 0 def
- /intop 0 def
-} bind def
-/Mboxout {
- outflag
- 1
- eq
- {
- 4 -1
- roll
- xadlft
- leadjust
- add
- sub
- 4 1 roll
- 3 -1
- roll
- yadbot
- leadjust
- add
- sub
- 3 1
- roll
- exch
- xadrht
- leadjust
- add
- add
- exch
- yadtop
- leadjust
- add
- add
- /outflag 0 def
- /xadlft 0 def
- /yadbot 0 def
- /xadrht 0 def
- /yadtop 0 def
- } if
-} bind def
-/leadjust {
- (m) stringwidth pop
- .5 mul
-} bind def
-/Mrotcheck {
- dup
- 90
- eq
- {
- yadbot
- /yadbot
- xadrht
- def
- /xadrht
- yadtop
- def
- /yadtop
- xadlft
- def
- /xadlft
- exch
- def
- }
- if
- dup
- cos
- 1 index
- sin
- Checkaux
- dup
- cos
- 1 index
- sin neg
- exch
- Checkaux
- 3 1 roll
- pop pop
-} bind def
-/Checkaux {
- 4 index
- exch
- 4 index
- mul
- 3 1 roll
- mul add
- 4 1 roll
-} bind def
-/Mboxrot {
- Mrot
- 90 eq
- {
- brotaux
- 4 2
- roll
- }
- if
- Mrot
- 180 eq
- {
- 4 2
- roll
- brotaux
- 4 2
- roll
- brotaux
- }
- if
- Mrot
- 270 eq
- {
- 4 2
- roll
- brotaux
- }
- if
-} bind def
-/brotaux {
- neg
- exch
- neg
-} bind def
-/Mabsproc {
- 0
- matrix defaultmatrix
- dtransform idtransform
- dup mul exch
- dup mul
- add sqrt
-} bind def
-/Mabswid {
- Mabsproc
- setlinewidth
-} bind def
-/Mabsdash {
- exch
- [
- exch
- {
- Mabsproc
- }
- forall
- ]
- exch
- setdash
-} bind def
-/MBeginOrig { Momatrix concat} bind def
-/MEndOrig { Mgmatrix setmatrix} bind def
-/sampledsound where
-{ pop}
-{ /sampledsound {
-exch
-pop
-exch
-5 1 roll
-mul
-4 idiv
-mul
-2 idiv
-exch pop
-exch
-/Mtempproc exch def
-{ Mtempproc pop }
-repeat
-} bind def
-} ifelse
-
-/MFill {
- 0 0 moveto
- Mwidth 0 lineto
- Mwidth Mheight lineto
- 0 Mheight lineto
- fill
-} bind def
-
-/MPlotRegion {
- 3 index
- Mwidth mul
- 2 index
- Mheight mul
- translate
- exch sub
- Mheight mul
- /Mheight
- exch def
- exch sub
- Mwidth mul
- /Mwidth
- exch def
-} bind def
-
-/Mcharproc
-{
- currentfile
- (x)
- readhexstring
- pop
- 0 get
- exch
- div
-} bind def
-
-/Mshadeproc
-{
- dup
- 3 1
- roll
- {
- dup
- Mcharproc
- 3 1
- roll
- } repeat
- 1 eq
- {
- setgray
- }
- {
- 3 eq
- {
- setrgbcolor
- }
- {
- setcmykcolor
- } ifelse
- } ifelse
-} bind def
-
-/Mrectproc
-{
- 3 index
- 2 index
- moveto
- 2 index
- 3 -1
- roll
- lineto
- dup
- 3 1
- roll
- lineto
- lineto
- fill
-} bind def
-
-/_Mcolorimage
-{
- 7 1
- roll
- pop
- pop
- matrix
- invertmatrix
- concat
- 2 exch exp
- 1 sub
- 3 1 roll
- 1 1
- 2 index
- {
- 1 1
- 4 index
- {
- dup
- 1 sub
- exch
- 2 index
- dup
- 1 sub
- exch
- 7 index
- 9 index
- Mshadeproc
- Mrectproc
- } for
- pop
- } for
- pop pop pop pop
-} bind def
-
-/_Mimage
-{
- pop
- matrix
- invertmatrix
- concat
- 2 exch exp
- 1 sub
- 3 1 roll
- 1 1
- 2 index
- {
- 1 1
- 4 index
- {
- dup
- 1 sub
- exch
- 2 index
- dup
- 1 sub
- exch
- 7 index
- Mcharproc
- setgray
- Mrectproc
- } for
- pop
- } for
- pop pop pop
-} bind def
-
-/Mimage {
- 4 index
- 4 index
- mul 1600 gt
- { image }
- { _Mimage }
- ifelse
-} def
-
-/Mcolorimage {
- 6 index
- 6 index
- mul 1600 gt
- { colorimage }
- { _Mcolorimage }
- ifelse
-} def
-
-/g { setgray} bind def
-/k { setcmykcolor} bind def
-/p { gsave} bind def
-/r { setrgbcolor} bind def
-/w { setlinewidth} bind def
-/C { curveto} bind def
-/F { fill} bind def
-/L { lineto} bind def
-/rL { rlineto} bind def
-/P { grestore} bind def
-/s { stroke} bind def
-/S { show} bind def
-/N {currentpoint 3 -1 roll show moveto} bind def
-/Msf { findfont exch scalefont [1 0 0 -1 0 0 ] makefont setfont} bind def
-/m { moveto} bind def
-/Mr { rmoveto} bind def
-/Mx {currentpoint exch pop moveto} bind def
-/My {currentpoint pop exch moveto} bind def
-/X {0 rmoveto} bind def
-/Y {0 exch rmoveto} bind def
-gsave
-newpath
- 143.312 110.312 moveto
- 277.500 110.312 lineto
- 277.500 27.438 lineto
- 143.312 27.438 lineto
- 143.312 110.312 lineto
-closepath
-clip newpath
-grestore
-gsave
-newpath
- 308.875 126.625 moveto
- 362.250 126.625 lineto
- 362.250 19.875 lineto
- 308.875 19.875 lineto
- 308.875 126.625 lineto
-closepath
-clip newpath
-grestore
-gsave
-newpath
- 311.688 102.688 moveto
- 327.562 102.688 lineto
- 327.562 92.875 lineto
- 311.688 92.875 lineto
- 311.688 102.688 lineto
-closepath
-clip newpath
-grestore
-gsave
-newpath
- 308.875 126.625 moveto
- 362.250 126.625 lineto
- 362.250 19.875 lineto
- 308.875 19.875 lineto
- 308.875 126.625 lineto
-closepath
-clip newpath
-grestore
-gsave
-newpath
- 308.875 126.625 moveto
- 362.250 126.625 lineto
- 362.250 19.875 lineto
- 308.875 19.875 lineto
- 308.875 126.625 lineto
-closepath
-clip newpath
-grestore
-gsave
-newpath
- 311.688 53.562 moveto
- 327.562 53.562 lineto
- 327.562 43.750 lineto
- 311.688 43.750 lineto
- 311.688 53.562 lineto
-closepath
-clip newpath
-grestore
-gsave
-newpath
- 308.875 126.625 moveto
- 362.250 126.625 lineto
- 362.250 19.875 lineto
- 308.875 19.875 lineto
- 308.875 126.625 lineto
-closepath
-clip newpath
-grestore
-gsave
-newpath
- 308.875 126.625 moveto
- 362.250 126.625 lineto
- 362.250 19.875 lineto
- 308.875 19.875 lineto
- 308.875 126.625 lineto
-closepath
-clip newpath
-grestore
-gsave
-newpath
- 88.562 142.562 moveto
- 374.375 142.562 lineto
- 374.375 4.000 lineto
- 88.562 4.000 lineto
- 88.562 142.562 lineto
-closepath
-clip newpath
-grestore
-/pp_save save def /showpage {} def
-
-gsave
-/MacintoshRomanEncoding [
- /.notdef/.notdef/.notdef/.notdef/.notdef/.no...
[truncated message content] |
|
From: <mh...@us...> - 2009-03-23 07:51:40
|
Revision: 9416
http://sbml.svn.sourceforge.net/sbml/?rev=9416&view=rev
Author: mhucka
Date: 2009-03-23 07:51:36 +0000 (Mon, 23 Mar 2009)
Log Message:
-----------
Reduced the size of the plot a little bit, to make it easier
to fit into the test runner's display window.
Modified Paths:
--------------
trunk/test-suite/src/utilities/plotresults/plotresults.sh
Modified: trunk/test-suite/src/utilities/plotresults/plotresults.sh
===================================================================
--- trunk/test-suite/src/utilities/plotresults/plotresults.sh 2009-03-23 07:28:17 UTC (rev 9415)
+++ trunk/test-suite/src/utilities/plotresults/plotresults.sh 2009-03-23 07:51:36 UTC (rev 9416)
@@ -106,7 +106,7 @@
set rmargin 3
set bmargin 8
set lmargin 15
-set size 0.97,0.97
+set size 0.9,0.9
set terminal jpeg
set output "${INPUTFILE/%.csv}.jpg"
plot "$INPUTFILE" using 1:2 title 2 with lines, "" using 1:3 title 3 with lines, "" using 1:4 title 4 with lines, "" using 1:5 title 5 with lines, "" using 1:6 title 6 with lines, "" using 1:7 title 7 with lines, "" using 1:8 title 8 with lines, "" using 1:9 title 9 with lines
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mh...@us...> - 2009-03-23 07:28:49
|
Revision: 9415
http://sbml.svn.sourceforge.net/sbml/?rev=9415&view=rev
Author: mhucka
Date: 2009-03-23 07:28:17 +0000 (Mon, 23 Mar 2009)
Log Message:
-----------
Updated all jpg diagrams for (1) updated test results
generated by Sarah and (2) slightly smaller image size for better fit in
the Test Suite Runner.
Modified Paths:
--------------
trunk/test-suite/cases/semantic/00001/00001-plot.jpg
trunk/test-suite/cases/semantic/00002/00002-plot.jpg
trunk/test-suite/cases/semantic/00003/00003-plot.jpg
trunk/test-suite/cases/semantic/00004/00004-plot.jpg
trunk/test-suite/cases/semantic/00005/00005-plot.jpg
trunk/test-suite/cases/semantic/00006/00006-plot.jpg
trunk/test-suite/cases/semantic/00007/00007-plot.jpg
trunk/test-suite/cases/semantic/00008/00008-plot.jpg
trunk/test-suite/cases/semantic/00009/00009-plot.jpg
trunk/test-suite/cases/semantic/00010/00010-plot.jpg
trunk/test-suite/cases/semantic/00011/00011-plot.jpg
trunk/test-suite/cases/semantic/00012/00012-plot.jpg
trunk/test-suite/cases/semantic/00013/00013-plot.jpg
trunk/test-suite/cases/semantic/00014/00014-plot.jpg
trunk/test-suite/cases/semantic/00015/00015-plot.jpg
trunk/test-suite/cases/semantic/00016/00016-plot.jpg
trunk/test-suite/cases/semantic/00017/00017-plot.jpg
trunk/test-suite/cases/semantic/00018/00018-plot.jpg
trunk/test-suite/cases/semantic/00019/00019-plot.jpg
trunk/test-suite/cases/semantic/00020/00020-plot.jpg
trunk/test-suite/cases/semantic/00021/00021-plot.jpg
trunk/test-suite/cases/semantic/00022/00022-plot.jpg
trunk/test-suite/cases/semantic/00023/00023-plot.jpg
trunk/test-suite/cases/semantic/00024/00024-plot.jpg
trunk/test-suite/cases/semantic/00025/00025-plot.jpg
trunk/test-suite/cases/semantic/00026/00026-plot.jpg
trunk/test-suite/cases/semantic/00027/00027-plot.jpg
trunk/test-suite/cases/semantic/00028/00028-plot.jpg
trunk/test-suite/cases/semantic/00029/00029-plot.jpg
trunk/test-suite/cases/semantic/00030/00030-plot.jpg
trunk/test-suite/cases/semantic/00031/00031-plot.jpg
trunk/test-suite/cases/semantic/00032/00032-plot.jpg
trunk/test-suite/cases/semantic/00033/00033-plot.jpg
trunk/test-suite/cases/semantic/00034/00034-plot.jpg
trunk/test-suite/cases/semantic/00035/00035-plot.jpg
trunk/test-suite/cases/semantic/00036/00036-plot.jpg
trunk/test-suite/cases/semantic/00037/00037-plot.jpg
trunk/test-suite/cases/semantic/00038/00038-plot.jpg
trunk/test-suite/cases/semantic/00039/00039-plot.jpg
trunk/test-suite/cases/semantic/00040/00040-plot.jpg
trunk/test-suite/cases/semantic/00041/00041-plot.jpg
trunk/test-suite/cases/semantic/00042/00042-plot.jpg
trunk/test-suite/cases/semantic/00043/00043-plot.jpg
trunk/test-suite/cases/semantic/00044/00044-plot.jpg
trunk/test-suite/cases/semantic/00045/00045-plot.jpg
trunk/test-suite/cases/semantic/00046/00046-plot.jpg
trunk/test-suite/cases/semantic/00047/00047-plot.jpg
trunk/test-suite/cases/semantic/00048/00048-plot.jpg
trunk/test-suite/cases/semantic/00049/00049-plot.jpg
trunk/test-suite/cases/semantic/00050/00050-plot.jpg
trunk/test-suite/cases/semantic/00051/00051-plot.jpg
trunk/test-suite/cases/semantic/00052/00052-plot.jpg
trunk/test-suite/cases/semantic/00053/00053-plot.jpg
trunk/test-suite/cases/semantic/00054/00054-plot.jpg
trunk/test-suite/cases/semantic/00055/00055-plot.jpg
trunk/test-suite/cases/semantic/00056/00056-plot.jpg
trunk/test-suite/cases/semantic/00057/00057-plot.jpg
trunk/test-suite/cases/semantic/00058/00058-plot.jpg
trunk/test-suite/cases/semantic/00059/00059-plot.jpg
trunk/test-suite/cases/semantic/00060/00060-plot.jpg
trunk/test-suite/cases/semantic/00061/00061-plot.jpg
trunk/test-suite/cases/semantic/00062/00062-plot.jpg
trunk/test-suite/cases/semantic/00063/00063-plot.jpg
trunk/test-suite/cases/semantic/00064/00064-plot.jpg
trunk/test-suite/cases/semantic/00065/00065-plot.jpg
trunk/test-suite/cases/semantic/00066/00066-plot.jpg
trunk/test-suite/cases/semantic/00067/00067-plot.jpg
trunk/test-suite/cases/semantic/00068/00068-plot.jpg
trunk/test-suite/cases/semantic/00069/00069-plot.jpg
trunk/test-suite/cases/semantic/00070/00070-plot.jpg
trunk/test-suite/cases/semantic/00071/00071-plot.jpg
trunk/test-suite/cases/semantic/00072/00072-plot.jpg
trunk/test-suite/cases/semantic/00073/00073-plot.jpg
trunk/test-suite/cases/semantic/00074/00074-plot.jpg
trunk/test-suite/cases/semantic/00075/00075-plot.jpg
trunk/test-suite/cases/semantic/00076/00076-plot.jpg
trunk/test-suite/cases/semantic/00077/00077-plot.jpg
trunk/test-suite/cases/semantic/00078/00078-plot.jpg
trunk/test-suite/cases/semantic/00079/00079-plot.jpg
trunk/test-suite/cases/semantic/00080/00080-plot.jpg
trunk/test-suite/cases/semantic/00081/00081-plot.jpg
trunk/test-suite/cases/semantic/00082/00082-plot.jpg
trunk/test-suite/cases/semantic/00083/00083-plot.jpg
trunk/test-suite/cases/semantic/00084/00084-plot.jpg
trunk/test-suite/cases/semantic/00085/00085-plot.jpg
trunk/test-suite/cases/semantic/00086/00086-plot.jpg
trunk/test-suite/cases/semantic/00087/00087-plot.jpg
trunk/test-suite/cases/semantic/00088/00088-plot.jpg
trunk/test-suite/cases/semantic/00089/00089-plot.jpg
trunk/test-suite/cases/semantic/00090/00090-plot.jpg
trunk/test-suite/cases/semantic/00091/00091-plot.jpg
trunk/test-suite/cases/semantic/00092/00092-plot.jpg
trunk/test-suite/cases/semantic/00093/00093-plot.jpg
trunk/test-suite/cases/semantic/00094/00094-plot.jpg
trunk/test-suite/cases/semantic/00095/00095-plot.jpg
trunk/test-suite/cases/semantic/00096/00096-plot.jpg
trunk/test-suite/cases/semantic/00097/00097-plot.jpg
trunk/test-suite/cases/semantic/00098/00098-plot.jpg
trunk/test-suite/cases/semantic/00099/00099-plot.jpg
trunk/test-suite/cases/semantic/00100/00100-plot.jpg
trunk/test-suite/cases/semantic/00101/00101-plot.jpg
trunk/test-suite/cases/semantic/00102/00102-plot.jpg
trunk/test-suite/cases/semantic/00103/00103-plot.jpg
trunk/test-suite/cases/semantic/00104/00104-plot.jpg
trunk/test-suite/cases/semantic/00105/00105-plot.jpg
trunk/test-suite/cases/semantic/00106/00106-plot.jpg
trunk/test-suite/cases/semantic/00107/00107-plot.jpg
trunk/test-suite/cases/semantic/00108/00108-plot.jpg
trunk/test-suite/cases/semantic/00109/00109-plot.jpg
trunk/test-suite/cases/semantic/00110/00110-plot.jpg
trunk/test-suite/cases/semantic/00111/00111-plot.jpg
trunk/test-suite/cases/semantic/00112/00112-plot.jpg
trunk/test-suite/cases/semantic/00113/00113-plot.jpg
trunk/test-suite/cases/semantic/00114/00114-plot.jpg
trunk/test-suite/cases/semantic/00115/00115-plot.jpg
trunk/test-suite/cases/semantic/00116/00116-plot.jpg
trunk/test-suite/cases/semantic/00117/00117-plot.jpg
trunk/test-suite/cases/semantic/00118/00118-plot.jpg
trunk/test-suite/cases/semantic/00119/00119-plot.jpg
trunk/test-suite/cases/semantic/00120/00120-plot.jpg
trunk/test-suite/cases/semantic/00121/00121-plot.jpg
trunk/test-suite/cases/semantic/00122/00122-plot.jpg
trunk/test-suite/cases/semantic/00123/00123-plot.jpg
trunk/test-suite/cases/semantic/00124/00124-plot.jpg
trunk/test-suite/cases/semantic/00125/00125-plot.jpg
trunk/test-suite/cases/semantic/00126/00126-plot.jpg
trunk/test-suite/cases/semantic/00127/00127-plot.jpg
trunk/test-suite/cases/semantic/00128/00128-plot.jpg
trunk/test-suite/cases/semantic/00129/00129-plot.jpg
trunk/test-suite/cases/semantic/00130/00130-plot.jpg
trunk/test-suite/cases/semantic/00131/00131-plot.jpg
trunk/test-suite/cases/semantic/00132/00132-plot.jpg
trunk/test-suite/cases/semantic/00133/00133-plot.jpg
trunk/test-suite/cases/semantic/00134/00134-plot.jpg
trunk/test-suite/cases/semantic/00135/00135-plot.jpg
trunk/test-suite/cases/semantic/00136/00136-plot.jpg
trunk/test-suite/cases/semantic/00137/00137-plot.jpg
trunk/test-suite/cases/semantic/00138/00138-plot.jpg
trunk/test-suite/cases/semantic/00139/00139-plot.jpg
trunk/test-suite/cases/semantic/00140/00140-plot.jpg
trunk/test-suite/cases/semantic/00141/00141-plot.jpg
trunk/test-suite/cases/semantic/00142/00142-plot.jpg
trunk/test-suite/cases/semantic/00143/00143-plot.jpg
trunk/test-suite/cases/semantic/00144/00144-plot.jpg
trunk/test-suite/cases/semantic/00145/00145-plot.jpg
trunk/test-suite/cases/semantic/00146/00146-plot.jpg
trunk/test-suite/cases/semantic/00147/00147-plot.jpg
trunk/test-suite/cases/semantic/00148/00148-plot.jpg
trunk/test-suite/cases/semantic/00149/00149-plot.jpg
trunk/test-suite/cases/semantic/00150/00150-plot.jpg
trunk/test-suite/cases/semantic/00151/00151-plot.jpg
trunk/test-suite/cases/semantic/00152/00152-plot.jpg
trunk/test-suite/cases/semantic/00153/00153-plot.jpg
trunk/test-suite/cases/semantic/00154/00154-plot.jpg
trunk/test-suite/cases/semantic/00155/00155-plot.jpg
trunk/test-suite/cases/semantic/00156/00156-plot.jpg
trunk/test-suite/cases/semantic/00157/00157-plot.jpg
trunk/test-suite/cases/semantic/00158/00158-plot.jpg
trunk/test-suite/cases/semantic/00159/00159-plot.jpg
trunk/test-suite/cases/semantic/00160/00160-plot.jpg
trunk/test-suite/cases/semantic/00161/00161-plot.jpg
trunk/test-suite/cases/semantic/00162/00162-plot.jpg
trunk/test-suite/cases/semantic/00163/00163-plot.jpg
trunk/test-suite/cases/semantic/00164/00164-plot.jpg
trunk/test-suite/cases/semantic/00165/00165-plot.jpg
trunk/test-suite/cases/semantic/00166/00166-plot.jpg
trunk/test-suite/cases/semantic/00167/00167-plot.jpg
trunk/test-suite/cases/semantic/00168/00168-plot.jpg
trunk/test-suite/cases/semantic/00169/00169-plot.jpg
trunk/test-suite/cases/semantic/00170/00170-plot.jpg
trunk/test-suite/cases/semantic/00171/00171-plot.jpg
trunk/test-suite/cases/semantic/00172/00172-plot.jpg
trunk/test-suite/cases/semantic/00173/00173-plot.jpg
trunk/test-suite/cases/semantic/00174/00174-plot.jpg
trunk/test-suite/cases/semantic/00175/00175-plot.jpg
trunk/test-suite/cases/semantic/00176/00176-plot.jpg
trunk/test-suite/cases/semantic/00177/00177-plot.jpg
trunk/test-suite/cases/semantic/00178/00178-plot.jpg
trunk/test-suite/cases/semantic/00179/00179-plot.jpg
trunk/test-suite/cases/semantic/00180/00180-plot.jpg
trunk/test-suite/cases/semantic/00181/00181-plot.jpg
trunk/test-suite/cases/semantic/00182/00182-plot.jpg
trunk/test-suite/cases/semantic/00183/00183-plot.jpg
trunk/test-suite/cases/semantic/00184/00184-plot.jpg
trunk/test-suite/cases/semantic/00185/00185-plot.jpg
trunk/test-suite/cases/semantic/00186/00186-plot.jpg
trunk/test-suite/cases/semantic/00187/00187-plot.jpg
trunk/test-suite/cases/semantic/00188/00188-plot.jpg
trunk/test-suite/cases/semantic/00189/00189-plot.jpg
trunk/test-suite/cases/semantic/00190/00190-plot.jpg
trunk/test-suite/cases/semantic/00191/00191-plot.jpg
trunk/test-suite/cases/semantic/00192/00192-plot.jpg
trunk/test-suite/cases/semantic/00193/00193-plot.jpg
trunk/test-suite/cases/semantic/00194/00194-plot.jpg
trunk/test-suite/cases/semantic/00195/00195-plot.jpg
trunk/test-suite/cases/semantic/00196/00196-plot.jpg
trunk/test-suite/cases/semantic/00197/00197-plot.jpg
trunk/test-suite/cases/semantic/00198/00198-plot.jpg
trunk/test-suite/cases/semantic/00199/00199-plot.jpg
trunk/test-suite/cases/semantic/00200/00200-plot.jpg
trunk/test-suite/cases/semantic/00201/00201-plot.jpg
trunk/test-suite/cases/semantic/00202/00202-plot.jpg
trunk/test-suite/cases/semantic/00203/00203-plot.jpg
trunk/test-suite/cases/semantic/00204/00204-plot.jpg
trunk/test-suite/cases/semantic/00205/00205-plot.jpg
trunk/test-suite/cases/semantic/00206/00206-plot.jpg
trunk/test-suite/cases/semantic/00207/00207-plot.jpg
trunk/test-suite/cases/semantic/00208/00208-plot.jpg
trunk/test-suite/cases/semantic/00209/00209-plot.jpg
trunk/test-suite/cases/semantic/00210/00210-plot.jpg
trunk/test-suite/cases/semantic/00211/00211-plot.jpg
trunk/test-suite/cases/semantic/00212/00212-plot.jpg
trunk/test-suite/cases/semantic/00213/00213-plot.jpg
trunk/test-suite/cases/semantic/00214/00214-plot.jpg
trunk/test-suite/cases/semantic/00215/00215-plot.jpg
trunk/test-suite/cases/semantic/00216/00216-plot.jpg
trunk/test-suite/cases/semantic/00217/00217-plot.jpg
trunk/test-suite/cases/semantic/00218/00218-plot.jpg
trunk/test-suite/cases/semantic/00219/00219-plot.jpg
trunk/test-suite/cases/semantic/00220/00220-plot.jpg
trunk/test-suite/cases/semantic/00221/00221-plot.jpg
trunk/test-suite/cases/semantic/00222/00222-plot.jpg
trunk/test-suite/cases/semantic/00223/00223-plot.jpg
trunk/test-suite/cases/semantic/00224/00224-plot.jpg
trunk/test-suite/cases/semantic/00225/00225-plot.jpg
trunk/test-suite/cases/semantic/00226/00226-plot.jpg
trunk/test-suite/cases/semantic/00227/00227-plot.jpg
trunk/test-suite/cases/semantic/00228/00228-plot.jpg
trunk/test-suite/cases/semantic/00229/00229-plot.jpg
trunk/test-suite/cases/semantic/00230/00230-plot.jpg
trunk/test-suite/cases/semantic/00231/00231-plot.jpg
trunk/test-suite/cases/semantic/00232/00232-plot.jpg
trunk/test-suite/cases/semantic/00233/00233-plot.jpg
trunk/test-suite/cases/semantic/00234/00234-plot.jpg
trunk/test-suite/cases/semantic/00235/00235-plot.jpg
trunk/test-suite/cases/semantic/00236/00236-plot.jpg
trunk/test-suite/cases/semantic/00237/00237-plot.jpg
trunk/test-suite/cases/semantic/00238/00238-plot.jpg
trunk/test-suite/cases/semantic/00239/00239-plot.jpg
trunk/test-suite/cases/semantic/00240/00240-plot.jpg
trunk/test-suite/cases/semantic/00241/00241-plot.jpg
trunk/test-suite/cases/semantic/00242/00242-plot.jpg
trunk/test-suite/cases/semantic/00243/00243-plot.jpg
trunk/test-suite/cases/semantic/00244/00244-plot.jpg
trunk/test-suite/cases/semantic/00245/00245-plot.jpg
trunk/test-suite/cases/semantic/00246/00246-plot.jpg
trunk/test-suite/cases/semantic/00247/00247-plot.jpg
trunk/test-suite/cases/semantic/00248/00248-plot.jpg
trunk/test-suite/cases/semantic/00249/00249-plot.jpg
trunk/test-suite/cases/semantic/00250/00250-plot.jpg
trunk/test-suite/cases/semantic/00251/00251-plot.jpg
trunk/test-suite/cases/semantic/00252/00252-plot.jpg
trunk/test-suite/cases/semantic/00253/00253-plot.jpg
trunk/test-suite/cases/semantic/00254/00254-plot.jpg
trunk/test-suite/cases/semantic/00255/00255-plot.jpg
trunk/test-suite/cases/semantic/00256/00256-plot.jpg
trunk/test-suite/cases/semantic/00257/00257-plot.jpg
trunk/test-suite/cases/semantic/00258/00258-plot.jpg
trunk/test-suite/cases/semantic/00259/00259-plot.jpg
trunk/test-suite/cases/semantic/00260/00260-plot.jpg
trunk/test-suite/cases/semantic/00261/00261-plot.jpg
trunk/test-suite/cases/semantic/00262/00262-plot.jpg
trunk/test-suite/cases/semantic/00263/00263-plot.jpg
trunk/test-suite/cases/semantic/00264/00264-plot.jpg
trunk/test-suite/cases/semantic/00265/00265-plot.jpg
trunk/test-suite/cases/semantic/00266/00266-plot.jpg
trunk/test-suite/cases/semantic/00267/00267-plot.jpg
trunk/test-suite/cases/semantic/00268/00268-plot.jpg
trunk/test-suite/cases/semantic/00269/00269-plot.jpg
trunk/test-suite/cases/semantic/00270/00270-plot.jpg
trunk/test-suite/cases/semantic/00271/00271-plot.jpg
trunk/test-suite/cases/semantic/00272/00272-plot.jpg
trunk/test-suite/cases/semantic/00273/00273-plot.jpg
trunk/test-suite/cases/semantic/00274/00274-plot.jpg
trunk/test-suite/cases/semantic/00275/00275-plot.jpg
trunk/test-suite/cases/semantic/00276/00276-plot.jpg
trunk/test-suite/cases/semantic/00277/00277-plot.jpg
trunk/test-suite/cases/semantic/00278/00278-plot.jpg
trunk/test-suite/cases/semantic/00279/00279-plot.jpg
trunk/test-suite/cases/semantic/00280/00280-plot.jpg
trunk/test-suite/cases/semantic/00281/00281-plot.jpg
trunk/test-suite/cases/semantic/00283/00283-plot.jpg
trunk/test-suite/cases/semantic/00284/00284-plot.jpg
trunk/test-suite/cases/semantic/00285/00285-plot.jpg
trunk/test-suite/cases/semantic/00286/00286-plot.jpg
trunk/test-suite/cases/semantic/00287/00287-plot.jpg
trunk/test-suite/cases/semantic/00288/00288-plot.jpg
trunk/test-suite/cases/semantic/00289/00289-plot.jpg
trunk/test-suite/cases/semantic/00290/00290-plot.jpg
trunk/test-suite/cases/semantic/00291/00291-plot.jpg
trunk/test-suite/cases/semantic/00292/00292-plot.jpg
trunk/test-suite/cases/semantic/00293/00293-plot.jpg
trunk/test-suite/cases/semantic/00294/00294-plot.jpg
trunk/test-suite/cases/semantic/00295/00295-plot.jpg
trunk/test-suite/cases/semantic/00296/00296-plot.jpg
trunk/test-suite/cases/semantic/00297/00297-plot.jpg
trunk/test-suite/cases/semantic/00298/00298-plot.jpg
trunk/test-suite/cases/semantic/00299/00299-plot.jpg
trunk/test-suite/cases/semantic/00300/00300-plot.jpg
trunk/test-suite/cases/semantic/00301/00301-plot.jpg
trunk/test-suite/cases/semantic/00302/00302-plot.jpg
trunk/test-suite/cases/semantic/00303/00303-plot.jpg
trunk/test-suite/cases/semantic/00304/00304-plot.jpg
trunk/test-suite/cases/semantic/00305/00305-plot.jpg
trunk/test-suite/cases/semantic/00306/00306-plot.jpg
trunk/test-suite/cases/semantic/00307/00307-plot.jpg
trunk/test-suite/cases/semantic/00308/00308-plot.jpg
trunk/test-suite/cases/semantic/00309/00309-plot.jpg
trunk/test-suite/cases/semantic/00310/00310-plot.jpg
trunk/test-suite/cases/semantic/00311/00311-plot.jpg
trunk/test-suite/cases/semantic/00312/00312-plot.jpg
trunk/test-suite/cases/semantic/00313/00313-plot.jpg
trunk/test-suite/cases/semantic/00314/00314-plot.jpg
trunk/test-suite/cases/semantic/00315/00315-plot.jpg
trunk/test-suite/cases/semantic/00316/00316-plot.jpg
trunk/test-suite/cases/semantic/00317/00317-plot.jpg
trunk/test-suite/cases/semantic/00318/00318-plot.jpg
trunk/test-suite/cases/semantic/00319/00319-plot.jpg
trunk/test-suite/cases/semantic/00320/00320-plot.jpg
trunk/test-suite/cases/semantic/00321/00321-plot.jpg
trunk/test-suite/cases/semantic/00322/00322-plot.jpg
trunk/test-suite/cases/semantic/00323/00323-plot.jpg
trunk/test-suite/cases/semantic/00324/00324-plot.jpg
trunk/test-suite/cases/semantic/00325/00325-plot.jpg
trunk/test-suite/cases/semantic/00326/00326-plot.jpg
trunk/test-suite/cases/semantic/00327/00327-plot.jpg
trunk/test-suite/cases/semantic/00328/00328-plot.jpg
trunk/test-suite/cases/semantic/00329/00329-plot.jpg
trunk/test-suite/cases/semantic/00330/00330-plot.jpg
trunk/test-suite/cases/semantic/00331/00331-plot.jpg
trunk/test-suite/cases/semantic/00332/00332-plot.jpg
trunk/test-suite/cases/semantic/00333/00333-plot.jpg
trunk/test-suite/cases/semantic/00334/00334-plot.jpg
trunk/test-suite/cases/semantic/00335/00335-plot.jpg
trunk/test-suite/cases/semantic/00336/00336-plot.jpg
trunk/test-suite/cases/semantic/00337/00337-plot.jpg
trunk/test-suite/cases/semantic/00338/00338-plot.jpg
trunk/test-suite/cases/semantic/00339/00339-plot.jpg
trunk/test-suite/cases/semantic/00340/00340-plot.jpg
trunk/test-suite/cases/semantic/00341/00341-plot.jpg
trunk/test-suite/cases/semantic/00342/00342-plot.jpg
trunk/test-suite/cases/semantic/00343/00343-plot.jpg
trunk/test-suite/cases/semantic/00344/00344-plot.jpg
trunk/test-suite/cases/semantic/00345/00345-plot.jpg
trunk/test-suite/cases/semantic/00346/00346-plot.jpg
trunk/test-suite/cases/semantic/00347/00347-plot.jpg
trunk/test-suite/cases/semantic/00348/00348-plot.jpg
trunk/test-suite/cases/semantic/00349/00349-plot.jpg
trunk/test-suite/cases/semantic/00350/00350-plot.jpg
trunk/test-suite/cases/semantic/00351/00351-plot.jpg
trunk/test-suite/cases/semantic/00352/00352-plot.jpg
trunk/test-suite/cases/semantic/00353/00353-plot.jpg
trunk/test-suite/cases/semantic/00354/00354-plot.jpg
trunk/test-suite/cases/semantic/00355/00355-plot.jpg
trunk/test-suite/cases/semantic/00356/00356-plot.jpg
trunk/test-suite/cases/semantic/00357/00357-plot.jpg
trunk/test-suite/cases/semantic/00358/00358-plot.jpg
trunk/test-suite/cases/semantic/00359/00359-plot.jpg
trunk/test-suite/cases/semantic/00360/00360-plot.jpg
trunk/test-suite/cases/semantic/00361/00361-plot.jpg
trunk/test-suite/cases/semantic/00362/00362-plot.jpg
trunk/test-suite/cases/semantic/00363/00363-plot.jpg
trunk/test-suite/cases/semantic/00364/00364-plot.jpg
trunk/test-suite/cases/semantic/00365/00365-plot.jpg
trunk/test-suite/cases/semantic/00366/00366-plot.jpg
trunk/test-suite/cases/semantic/00367/00367-plot.jpg
trunk/test-suite/cases/semantic/00368/00368-plot.jpg
trunk/test-suite/cases/semantic/00369/00369-plot.jpg
trunk/test-suite/cases/semantic/00370/00370-plot.jpg
trunk/test-suite/cases/semantic/00371/00371-plot.jpg
trunk/test-suite/cases/semantic/00372/00372-plot.jpg
trunk/test-suite/cases/semantic/00373/00373-plot.jpg
trunk/test-suite/cases/semantic/00374/00374-plot.jpg
trunk/test-suite/cases/semantic/00375/00375-plot.jpg
trunk/test-suite/cases/semantic/00376/00376-plot.jpg
trunk/test-suite/cases/semantic/00377/00377-plot.jpg
trunk/test-suite/cases/semantic/00378/00378-plot.jpg
trunk/test-suite/cases/semantic/00379/00379-plot.jpg
trunk/test-suite/cases/semantic/00380/00380-plot.jpg
trunk/test-suite/cases/semantic/00381/00381-plot.jpg
trunk/test-suite/cases/semantic/00382/00382-plot.jpg
trunk/test-suite/cases/semantic/00383/00383-plot.jpg
trunk/test-suite/cases/semantic/00384/00384-plot.jpg
trunk/test-suite/cases/semantic/00385/00385-plot.jpg
trunk/test-suite/cases/semantic/00386/00386-plot.jpg
trunk/test-suite/cases/semantic/00387/00387-plot.jpg
trunk/test-suite/cases/semantic/00388/00388-plot.jpg
trunk/test-suite/cases/semantic/00389/00389-plot.jpg
trunk/test-suite/cases/semantic/00390/00390-plot.jpg
trunk/test-suite/cases/semantic/00391/00391-plot.jpg
trunk/test-suite/cases/semantic/00392/00392-plot.jpg
trunk/test-suite/cases/semantic/00393/00393-plot.jpg
trunk/test-suite/cases/semantic/00394/00394-plot.jpg
trunk/test-suite/cases/semantic/00395/00395-plot.jpg
trunk/test-suite/cases/semantic/00396/00396-plot.jpg
trunk/test-suite/cases/semantic/00397/00397-plot.jpg
trunk/test-suite/cases/semantic/00398/00398-plot.jpg
trunk/test-suite/cases/semantic/00399/00399-plot.jpg
trunk/test-suite/cases/semantic/00400/00400-plot.jpg
trunk/test-suite/cases/semantic/00401/00401-plot.jpg
trunk/test-suite/cases/semantic/00402/00402-plot.jpg
trunk/test-suite/cases/semantic/00403/00403-plot.jpg
trunk/test-suite/cases/semantic/00404/00404-plot.jpg
trunk/test-suite/cases/semantic/00405/00405-plot.jpg
trunk/test-suite/cases/semantic/00406/00406-plot.jpg
trunk/test-suite/cases/semantic/00407/00407-plot.jpg
trunk/test-suite/cases/semantic/00408/00408-plot.jpg
trunk/test-suite/cases/semantic/00409/00409-plot.jpg
trunk/test-suite/cases/semantic/00410/00410-plot.jpg
trunk/test-suite/cases/semantic/00411/00411-plot.jpg
trunk/test-suite/cases/semantic/00412/00412-plot.jpg
trunk/test-suite/cases/semantic/00413/00413-plot.jpg
trunk/test-suite/cases/semantic/00414/00414-plot.jpg
trunk/test-suite/cases/semantic/00415/00415-plot.jpg
trunk/test-suite/cases/semantic/00416/00416-plot.jpg
trunk/test-suite/cases/semantic/00417/00417-plot.jpg
trunk/test-suite/cases/semantic/00418/00418-plot.jpg
trunk/test-suite/cases/semantic/00419/00419-plot.jpg
trunk/test-suite/cases/semantic/00420/00420-plot.jpg
trunk/test-suite/cases/semantic/00421/00421-plot.jpg
trunk/test-suite/cases/semantic/00422/00422-plot.jpg
trunk/test-suite/cases/semantic/00423/00423-plot.jpg
trunk/test-suite/cases/semantic/00424/00424-plot.jpg
trunk/test-suite/cases/semantic/00425/00425-plot.jpg
trunk/test-suite/cases/semantic/00426/00426-plot.jpg
trunk/test-suite/cases/semantic/00427/00427-plot.jpg
trunk/test-suite/cases/semantic/00428/00428-plot.jpg
trunk/test-suite/cases/semantic/00429/00429-plot.jpg
trunk/test-suite/cases/semantic/00430/00430-plot.jpg
trunk/test-suite/cases/semantic/00431/00431-plot.jpg
trunk/test-suite/cases/semantic/00432/00432-plot.jpg
trunk/test-suite/cases/semantic/00433/00433-plot.jpg
trunk/test-suite/cases/semantic/00434/00434-plot.jpg
trunk/test-suite/cases/semantic/00435/00435-plot.jpg
trunk/test-suite/cases/semantic/00436/00436-plot.jpg
trunk/test-suite/cases/semantic/00437/00437-plot.jpg
trunk/test-suite/cases/semantic/00438/00438-plot.jpg
trunk/test-suite/cases/semantic/00439/00439-plot.jpg
trunk/test-suite/cases/semantic/00440/00440-plot.jpg
trunk/test-suite/cases/semantic/00441/00441-plot.jpg
trunk/test-suite/cases/semantic/00442/00442-plot.jpg
trunk/test-suite/cases/semantic/00443/00443-plot.jpg
trunk/test-suite/cases/semantic/00444/00444-plot.jpg
trunk/test-suite/cases/semantic/00445/00445-plot.jpg
trunk/test-suite/cases/semantic/00446/00446-plot.jpg
trunk/test-suite/cases/semantic/00447/00447-plot.jpg
trunk/test-suite/cases/semantic/00448/00448-plot.jpg
trunk/test-suite/cases/semantic/00449/00449-plot.jpg
trunk/test-suite/cases/semantic/00450/00450-plot.jpg
trunk/test-suite/cases/semantic/00451/00451-plot.jpg
trunk/test-suite/cases/semantic/00452/00452-plot.jpg
trunk/test-suite/cases/semantic/00453/00453-plot.jpg
trunk/test-suite/cases/semantic/00454/00454-plot.jpg
trunk/test-suite/cases/semantic/00455/00455-plot.jpg
trunk/test-suite/cases/semantic/00456/00456-plot.jpg
trunk/test-suite/cases/semantic/00457/00457-plot.jpg
trunk/test-suite/cases/semantic/00458/00458-plot.jpg
trunk/test-suite/cases/semantic/00459/00459-plot.jpg
trunk/test-suite/cases/semantic/00460/00460-plot.jpg
trunk/test-suite/cases/semantic/00461/00461-plot.jpg
trunk/test-suite/cases/semantic/00462/00462-plot.jpg
trunk/test-suite/cases/semantic/00463/00463-plot.jpg
trunk/test-suite/cases/semantic/00464/00464-plot.jpg
trunk/test-suite/cases/semantic/00465/00465-plot.jpg
trunk/test-suite/cases/semantic/00466/00466-plot.jpg
trunk/test-suite/cases/semantic/00467/00467-plot.jpg
trunk/test-suite/cases/semantic/00468/00468-plot.jpg
trunk/test-suite/cases/semantic/00469/00469-plot.jpg
trunk/test-suite/cases/semantic/00470/00470-plot.jpg
trunk/test-suite/cases/semantic/00471/00471-plot.jpg
trunk/test-suite/cases/semantic/00472/00472-plot.jpg
trunk/test-suite/cases/semantic/00473/00473-plot.jpg
trunk/test-suite/cases/semantic/00474/00474-plot.jpg
trunk/test-suite/cases/semantic/00475/00475-plot.jpg
trunk/test-suite/cases/semantic/00476/00476-plot.jpg
trunk/test-suite/cases/semantic/00477/00477-plot.jpg
trunk/test-suite/cases/semantic/00478/00478-plot.jpg
trunk/test-suite/cases/semantic/00479/00479-plot.jpg
trunk/test-suite/cases/semantic/00480/00480-plot.jpg
trunk/test-suite/cases/semantic/00481/00481-plot.jpg
trunk/test-suite/cases/semantic/00482/00482-plot.jpg
trunk/test-suite/cases/semantic/00483/00483-plot.jpg
trunk/test-suite/cases/semantic/00484/00484-plot.jpg
trunk/test-suite/cases/semantic/00485/00485-plot.jpg
trunk/test-suite/cases/semantic/00486/00486-plot.jpg
trunk/test-suite/cases/semantic/00487/00487-plot.jpg
trunk/test-suite/cases/semantic/00488/00488-plot.jpg
trunk/test-suite/cases/semantic/00489/00489-plot.jpg
trunk/test-suite/cases/semantic/00490/00490-plot.jpg
trunk/test-suite/cases/semantic/00491/00491-plot.jpg
trunk/test-suite/cases/semantic/00492/00492-plot.jpg
trunk/test-suite/cases/semantic/00493/00493-plot.jpg
trunk/test-suite/cases/semantic/00494/00494-plot.jpg
trunk/test-suite/cases/semantic/00495/00495-plot.jpg
trunk/test-suite/cases/semantic/00496/00496-plot.jpg
trunk/test-suite/cases/semantic/00497/00497-plot.jpg
trunk/test-suite/cases/semantic/00498/00498-plot.jpg
trunk/test-suite/cases/semantic/00499/00499-plot.jpg
trunk/test-suite/cases/semantic/00500/00500-plot.jpg
trunk/test-suite/cases/semantic/00501/00501-plot.jpg
trunk/test-suite/cases/semantic/00502/00502-plot.jpg
trunk/test-suite/cases/semantic/00503/00503-plot.jpg
trunk/test-suite/cases/semantic/00504/00504-plot.jpg
trunk/test-suite/cases/semantic/00505/00505-plot.jpg
trunk/test-suite/cases/semantic/00506/00506-plot.jpg
trunk/test-suite/cases/semantic/00507/00507-plot.jpg
trunk/test-suite/cases/semantic/00508/00508-plot.jpg
trunk/test-suite/cases/semantic/00509/00509-plot.jpg
trunk/test-suite/cases/semantic/00510/00510-plot.jpg
trunk/test-suite/cases/semantic/00511/00511-plot.jpg
trunk/test-suite/cases/semantic/00512/00512-plot.jpg
trunk/test-suite/cases/semantic/00513/00513-plot.jpg
trunk/test-suite/cases/semantic/00514/00514-plot.jpg
trunk/test-suite/cases/semantic/00515/00515-plot.jpg
trunk/test-suite/cases/semantic/00516/00516-plot.jpg
trunk/test-suite/cases/semantic/00517/00517-plot.jpg
trunk/test-suite/cases/semantic/00518/00518-plot.jpg
trunk/test-suite/cases/semantic/00519/00519-plot.jpg
trunk/test-suite/cases/semantic/00520/00520-plot.jpg
trunk/test-suite/cases/semantic/00521/00521-plot.jpg
trunk/test-suite/cases/semantic/00522/00522-plot.jpg
trunk/test-suite/cases/semantic/00523/00523-plot.jpg
trunk/test-suite/cases/semantic/00524/00524-plot.jpg
trunk/test-suite/cases/semantic/00525/00525-plot.jpg
trunk/test-suite/cases/semantic/00526/00526-plot.jpg
trunk/test-suite/cases/semantic/00527/00527-plot.jpg
trunk/test-suite/cases/semantic/00528/00528-plot.jpg
trunk/test-suite/cases/semantic/00529/00529-plot.jpg
trunk/test-suite/cases/semantic/00530/00530-plot.jpg
trunk/test-suite/cases/semantic/00531/00531-plot.jpg
trunk/test-suite/cases/semantic/00532/00532-plot.jpg
trunk/test-suite/cases/semantic/00533/00533-plot.jpg
trunk/test-suite/cases/semantic/00534/00534-plot.jpg
trunk/test-suite/cases/semantic/00535/00535-plot.jpg
trunk/test-suite/cases/semantic/00536/00536-plot.jpg
trunk/test-suite/cases/semantic/00537/00537-plot.jpg
trunk/test-suite/cases/semantic/00538/00538-plot.jpg
trunk/test-suite/cases/semantic/00539/00539-plot.jpg
trunk/test-suite/cases/semantic/00540/00540-plot.jpg
trunk/test-suite/cases/semantic/00541/00541-plot.jpg
trunk/test-suite/cases/semantic/00542/00542-plot.jpg
trunk/test-suite/cases/semantic/00543/00543-plot.jpg
trunk/test-suite/cases/semantic/00544/00544-plot.jpg
trunk/test-suite/cases/semantic/00545/00545-plot.jpg
trunk/test-suite/cases/semantic/00546/00546-plot.jpg
trunk/test-suite/cases/semantic/00547/00547-plot.jpg
trunk/test-suite/cases/semantic/00548/00548-plot.jpg
trunk/test-suite/cases/semantic/00549/00549-plot.jpg
trunk/test-suite/cases/semantic/00550/00550-plot.jpg
trunk/test-suite/cases/semantic/00551/00551-plot.jpg
trunk/test-suite/cases/semantic/00552/00552-plot.jpg
trunk/test-suite/cases/semantic/00553/00553-plot.jpg
trunk/test-suite/cases/semantic/00554/00554-plot.jpg
trunk/test-suite/cases/semantic/00555/00555-plot.jpg
trunk/test-suite/cases/semantic/00556/00556-plot.jpg
trunk/test-suite/cases/semantic/00557/00557-plot.jpg
trunk/test-suite/cases/semantic/00558/00558-plot.jpg
trunk/test-suite/cases/semantic/00559/00559-plot.jpg
trunk/test-suite/cases/semantic/00560/00560-plot.jpg
trunk/test-suite/cases/semantic/00561/00561-plot.jpg
trunk/test-suite/cases/semantic/00562/00562-plot.jpg
trunk/test-suite/cases/semantic/00563/00563-plot.jpg
trunk/test-suite/cases/semantic/00564/00564-plot.jpg
trunk/test-suite/cases/semantic/00565/00565-plot.jpg
trunk/test-suite/cases/semantic/00566/00566-plot.jpg
trunk/test-suite/cases/semantic/00567/00567-plot.jpg
trunk/test-suite/cases/semantic/00568/00568-plot.jpg
trunk/test-suite/cases/semantic/00569/00569-plot.jpg
trunk/test-suite/cases/semantic/00570/00570-plot.jpg
trunk/test-suite/cases/semantic/00571/00571-plot.jpg
trunk/test-suite/cases/semantic/00572/00572-plot.jpg
trunk/test-suite/cases/semantic/00573/00573-plot.jpg
trunk/test-suite/cases/semantic/00574/00574-plot.jpg
trunk/test-suite/cases/semantic/00575/00575-plot.jpg
trunk/test-suite/cases/semantic/00576/00576-plot.jpg
trunk/test-suite/cases/semantic/00577/00577-plot.jpg
trunk/test-suite/cases/semantic/00578/00578-plot.jpg
trunk/test-suite/cases/semantic/00579/00579-plot.jpg
trunk/test-suite/cases/semantic/00580/00580-plot.jpg
trunk/test-suite/cases/semantic/00581/00581-plot.jpg
trunk/test-suite/cases/semantic/00582/00582-plot.jpg
trunk/test-suite/cases/semantic/00583/00583-plot.jpg
trunk/test-suite/cases/semantic/00584/00584-plot.jpg
trunk/test-suite/cases/semantic/00585/00585-plot.jpg
trunk/test-suite/cases/semantic/00586/00586-plot.jpg
trunk/test-suite/cases/semantic/00587/00587-plot.jpg
trunk/test-suite/cases/semantic/00588/00588-plot.jpg
trunk/test-suite/cases/semantic/00589/00589-plot.jpg
trunk/test-suite/cases/semantic/00590/00590-plot.jpg
trunk/test-suite/cases/semantic/00591/00591-plot.jpg
trunk/test-suite/cases/semantic/00592/00592-plot.jpg
trunk/test-suite/cases/semantic/00593/00593-plot.jpg
trunk/test-suite/cases/semantic/00594/00594-plot.jpg
trunk/test-suite/cases/semantic/00595/00595-plot.jpg
trunk/test-suite/cases/semantic/00596/00596-plot.jpg
trunk/test-suite/cases/semantic/00597/00597-plot.jpg
trunk/test-suite/cases/semantic/00598/00598-plot.jpg
trunk/test-suite/cases/semantic/00599/00599-plot.jpg
trunk/test-suite/cases/semantic/00600/00600-plot.jpg
trunk/test-suite/cases/semantic/00601/00601-plot.jpg
trunk/test-suite/cases/semantic/00602/00602-plot.jpg
trunk/test-suite/cases/semantic/00603/00603-plot.jpg
trunk/test-suite/cases/semantic/00604/00604-plot.jpg
trunk/test-suite/cases/semantic/00605/00605-plot.jpg
trunk/test-suite/cases/semantic/00606/00606-plot.jpg
trunk/test-suite/cases/semantic/00607/00607-plot.jpg
trunk/test-suite/cases/semantic/00608/00608-plot.jpg
trunk/test-suite/cases/semantic/00609/00609-plot.jpg
trunk/test-suite/cases/semantic/00610/00610-plot.jpg
trunk/test-suite/cases/semantic/00611/00611-plot.jpg
trunk/test-suite/cases/semantic/00612/00612-plot.jpg
trunk/test-suite/cases/semantic/00613/00613-plot.jpg
trunk/test-suite/cases/semantic/00614/00614-plot.jpg
trunk/test-suite/cases/semantic/00615/00615-plot.jpg
trunk/test-suite/cases/semantic/00616/00616-plot.jpg
trunk/test-suite/cases/semantic/00617/00617-plot.jpg
trunk/test-suite/cases/semantic/00618/00618-plot.jpg
trunk/test-suite/cases/semantic/00619/00619-plot.jpg
trunk/test-suite/cases/semantic/00620/00620-plot.jpg
trunk/test-suite/cases/semantic/00621/00621-plot.jpg
trunk/test-suite/cases/semantic/00622/00622-plot.jpg
trunk/test-suite/cases/semantic/00623/00623-plot.jpg
trunk/test-suite/cases/semantic/00624/00624-plot.jpg
trunk/test-suite/cases/semantic/00625/00625-plot.jpg
trunk/test-suite/cases/semantic/00626/00626-plot.jpg
trunk/test-suite/cases/semantic/00627/00627-plot.jpg
trunk/test-suite/cases/semantic/00628/00628-plot.jpg
trunk/test-suite/cases/semantic/00629/00629-plot.jpg
trunk/test-suite/cases/semantic/00630/00630-plot.jpg
trunk/test-suite/cases/semantic/00631/00631-plot.jpg
trunk/test-suite/cases/semantic/00632/00632-plot.jpg
trunk/test-suite/cases/semantic/00633/00633-plot.jpg
trunk/test-suite/cases/semantic/00634/00634-plot.jpg
trunk/test-suite/cases/semantic/00635/00635-plot.jpg
trunk/test-suite/cases/semantic/00636/00636-plot.jpg
trunk/test-suite/cases/semantic/00637/00637-plot.jpg
trunk/test-suite/cases/semantic/00638/00638-plot.jpg
trunk/test-suite/cases/semantic/00639/00639-plot.jpg
trunk/test-suite/cases/semantic/00640/00640-plot.jpg
trunk/test-suite/cases/semantic/00641/00641-plot.jpg
trunk/test-suite/cases/semantic/00642/00642-plot.jpg
trunk/test-suite/cases/semantic/00643/00643-plot.jpg
trunk/test-suite/cases/semantic/00644/00644-plot.jpg
trunk/test-suite/cases/semantic/00645/00645-plot.jpg
trunk/test-suite/cases/semantic/00646/00646-plot.jpg
trunk/test-suite/cases/semantic/00647/00647-plot.jpg
trunk/test-suite/cases/semantic/00648/00648-plot.jpg
trunk/test-suite/cases/semantic/00649/00649-plot.jpg
trunk/test-suite/cases/semantic/00650/00650-plot.jpg
trunk/test-suite/cases/semantic/00651/00651-plot.jpg
trunk/test-suite/cases/semantic/00652/00652-plot.jpg
trunk/test-suite/cases/semantic/00653/00653-plot.jpg
trunk/test-suite/cases/semantic/00654/00654-plot.jpg
trunk/test-suite/cases/semantic/00655/00655-plot.jpg
trunk/test-suite/cases/semantic/00656/00656-plot.jpg
trunk/test-suite/cases/semantic/00657/00657-plot.jpg
trunk/test-suite/cases/semantic/00658/00658-plot.jpg
trunk/test-suite/cases/semantic/00659/00659-plot.jpg
trunk/test-suite/cases/semantic/00660/00660-plot.jpg
trunk/test-suite/cases/semantic/00661/00661-plot.jpg
trunk/test-suite/cases/semantic/00662/00662-plot.jpg
trunk/test-suite/cases/semantic/00663/00663-plot.jpg
trunk/test-suite/cases/semantic/00664/00664-plot.jpg
trunk/test-suite/cases/semantic/00665/00665-plot.jpg
trunk/test-suite/cases/semantic/00666/00666-plot.jpg
trunk/test-suite/cases/semantic/00667/00667-plot.jpg
trunk/test-suite/cases/semantic/00668/00668-plot.jpg
trunk/test-suite/cases/semantic/00669/00669-plot.jpg
trunk/test-suite/cases/semantic/00670/00670-plot.jpg
trunk/test-suite/cases/semantic/00671/00671-plot.jpg
trunk/test-suite/cases/semantic/00672/00672-plot.jpg
trunk/test-suite/cases/semantic/00673/00673-plot.jpg
trunk/test-suite/cases/semantic/00674/00674-plot.jpg
trunk/test-suite/cases/semantic/00675/00675-plot.jpg
trunk/test-suite/cases/semantic/00676/00676-plot.jpg
trunk/test-suite/cases/semantic/00677/00677-plot.jpg
trunk/test-suite/cases/semantic/00678/00678-plot.jpg
trunk/test-suite/cases/semantic/00679/00679-plot.jpg
trunk/test-suite/cases/semantic/00680/00680-plot.jpg
trunk/test-suite/cases/semantic/00681/00681-plot.jpg
trunk/test-suite/cases/semantic/00682/00682-plot.jpg
trunk/test-suite/cases/semantic/00683/00683-plot.jpg
trunk/test-suite/cases/semantic/00684/00684-plot.jpg
trunk/test-suite/cases/semantic/00685/00685-plot.jpg
trunk/test-suite/cases/semantic/00686/00686-plot.jpg
trunk/test-suite/cases/semantic/00687/00687-plot.jpg
trunk/test-suite/cases/semantic/00688/00688-plot.jpg
trunk/test-suite/cases/semantic/00689/00689-plot.jpg
trunk/test-suite/cases/semantic/00690/00690-plot.jpg
trunk/test-suite/cases/semantic/00691/00691-plot.jpg
trunk/test-suite/cases/semantic/00692/00692-plot.jpg
trunk/test-suite/cases/semantic/00693/00693-plot.jpg
trunk/test-suite/cases/semantic/00694/00694-plot.jpg
trunk/test-suite/cases/semantic/00695/00695-plot.jpg
trunk/test-suite/cases/semantic/00696/00696-plot.jpg
trunk/test-suite/cases/semantic/00697/00697-plot.jpg
trunk/test-suite/cases/semantic/00698/00698-plot.jpg
trunk/test-suite/cases/semantic/00699/00699-plot.jpg
trunk/test-suite/cases/semantic/00700/00700-plot.jpg
trunk/test-suite/cases/semantic/00701/00701-plot.jpg
trunk/test-suite/cases/semantic/00702/00702-plot.jpg
trunk/test-suite/cases/semantic/00703/00703-plot.jpg
trunk/test-suite/cases/semantic/00704/00704-plot.jpg
trunk/test-suite/cases/semantic/00705/00705-plot.jpg
trunk/test-suite/cases/semantic/00706/00706-plot.jpg
trunk/test-suite/cases/semantic/00707/00707-plot.jpg
trunk/test-suite/cases/semantic/00708/00708-plot.jpg
trunk/test-suite/cases/semantic/00709/00709-plot.jpg
trunk/test-suite/cases/semantic/00710/00710-plot.jpg
trunk/test-suite/cases/semantic/00711/00711-plot.jpg
trunk/test-suite/cases/semantic/00712/00712-plot.jpg
trunk/test-suite/cases/semantic/00713/00713-plot.jpg
trunk/test-suite/cases/semantic/00714/00714-plot.jpg
trunk/test-suite/cases/semantic/00715/00715-plot.jpg
trunk/test-suite/cases/semantic/00716/00716-plot.jpg
trunk/test-suite/cases/semantic/00717/00717-plot.jpg
trunk/test-suite/cases/semantic/00718/00718-plot.jpg
trunk/test-suite/cases/semantic/00719/00719-plot.jpg
trunk/test-suite/cases/semantic/00720/00720-plot.jpg
trunk/test-suite/cases/semantic/00721/00721-plot.jpg
trunk/test-suite/cases/semantic/00722/00722-plot.jpg
trunk/test-suite/cases/semantic/00723/00723-plot.jpg
trunk/test-suite/cases/semantic/00724/00724-plot.jpg
trunk/test-suite/cases/semantic/00725/00725-plot.jpg
trunk/test-suite/cases/semantic/00726/00726-plot.jpg
trunk/test-suite/cases/semantic/00727/00727-plot.jpg
trunk/test-suite/cases/semantic/00728/00728-plot.jpg
trunk/test-suite/cases/semantic/00729/00729-plot.jpg
trunk/test-suite/cases/semantic/00730/00730-plot.jpg
trunk/test-suite/cases/semantic/00731/00731-plot.jpg
trunk/test-suite/cases/semantic/00732/00732-plot.jpg
trunk/test-suite/cases/semantic/00733/00733-plot.jpg
trunk/test-suite/cases/semantic/00734/00734-plot.jpg
trunk/test-suite/cases/semantic/00735/00735-plot.jpg
trunk/test-suite/cases/semantic/00736/00736-plot.jpg
trunk/test-suite/cases/semantic/00737/00737-plot.jpg
trunk/test-suite/cases/semantic/00738/00738-plot.jpg
trunk/test-suite/cases/semantic/00739/00739-plot.jpg
trunk/test-suite/cases/semantic/00740/00740-plot.jpg
trunk/test-suite/cases/semantic/00741/00741-plot.jpg
trunk/test-suite/cases/semantic/00742/00742-plot.jpg
trunk/test-suite/cases/semantic/00743/00743-plot.jpg
trunk/test-suite/cases/semantic/00744/00744-plot.jpg
trunk/test-suite/cases/semantic/00745/00745-plot.jpg
trunk/test-suite/cases/semantic/00746/00746-plot.jpg
trunk/test-suite/cases/semantic/00747/00747-plot.jpg
trunk/test-suite/cases/semantic/00748/00748-plot.jpg
trunk/test-suite/cases/semantic/00749/00749-plot.jpg
trunk/test-suite/cases/semantic/00750/00750-plot.jpg
trunk/test-suite/cases/semantic/00751/00751-plot.jpg
trunk/test-suite/cases/semantic/00752/00752-plot.jpg
trunk/test-suite/cases/semantic/00753/00753-plot.jpg
trunk/test-suite/cases/semantic/00754/00754-plot.jpg
trunk/test-suite/cases/semantic/00755/00755-plot.jpg
trunk/test-suite/cases/semantic/00756/00756-plot.jpg
trunk/test-suite/cases/semantic/00757/00757-plot.jpg
trunk/test-suite/cases/semantic/00758/00758-plot.jpg
trunk/test-suite/cases/semantic/00759/00759-plot.jpg
trunk/test-suite/cases/semantic/00760/00760-plot.jpg
trunk/test-suite/cases/semantic/00761/00761-plot.jpg
trunk/test-suite/cases/semantic/00762/00762-plot.jpg
trunk/test-suite/cases/semantic/00763/00763-plot.jpg
trunk/test-suite/cases/semantic/00764/00764-plot.jpg
trunk/test-suite/cases/semantic/00765/00765-plot.jpg
trunk/test-suite/cases/semantic/00766/00766-plot.jpg
trunk/test-suite/cases/semantic/00767/00767-plot.jpg
trunk/test-suite/cases/semantic/00768/00768-plot.jpg
trunk/test-suite/cases/semantic/00769/00769-plot.jpg
trunk/test-suite/cases/semantic/00770/00770-plot.jpg
trunk/test-suite/cases/semantic/00771/00771-plot.jpg
trunk/test-suite/cases/semantic/00772/00772-plot.jpg
trunk/test-suite/cases/semantic/00773/00773-plot.jpg
trunk/test-suite/cases/semantic/00774/00774-plot.jpg
trunk/test-suite/cases/semantic/00775/00775-plot.jpg
trunk/test-suite/cases/semantic/00776/00776-plot.jpg
trunk/test-suite/cases/semantic/00777/00777-plot.jpg
trunk/test-suite/cases/semantic/00778/00778-plot.jpg
trunk/test-suite/cases/semantic/00779/00779-plot.jpg
trunk/test-suite/cases/semantic/00780/00780-plot.jpg
trunk/test-suite/cases/semantic/00781/00781-plot.jpg
trunk/test-suite/cases/semantic/00782/00782-plot.jpg
trunk/test-suite/cases/semantic/00783/00783-plot.jpg
trunk/test-suite/cases/semantic/00784/00784-plot.jpg
trunk/test-suite/cases/semantic/00785/00785-plot.jpg
trunk/test-suite/cases/semantic/00786/00786-plot.jpg
trunk/test-suite/cases/semantic/00787/00787-plot.jpg
trunk/test-suite/cases/semantic/00788/00788-plot.jpg
trunk/test-suite/cases/semantic/00789/00789-plot.jpg
trunk/test-suite/cases/semantic/00790/00790-plot.jpg
trunk/test-suite/cases/semantic/00791/00791-plot.jpg
trunk/test-suite/cases/semantic/00792/00792-plot.jpg
trunk/test-suite/cases/semantic/00793/00793-plot.jpg
trunk/test-suite/cases/semantic/00794/00794-plot.jpg
trunk/test-suite/cases/semantic/00795/00795-plot.jpg
trunk/test-suite/cases/semantic/00796/00796-plot.jpg
trunk/test-suite/cases/semantic/00797/00797-plot.jpg
trunk/test-suite/cases/semantic/00798/00798-plot.jpg
trunk/test-suite/cases/semantic/00799/00799-plot.jpg
trunk/test-suite/cases/semantic/00800/00800-plot.jpg
trunk/test-suite/cases/semantic/00801/00801-plot.jpg
trunk/test-suite/cases/semantic/00802/00802-plot.jpg
trunk/test-suite/cases/semantic/00803/00803-plot.jpg
trunk/test-suite/cases/semantic/00804/00804-plot.jpg
trunk/test-suite/cases/semantic/00805/00805-plot.jpg
trunk/test-suite/cases/semantic/00806/00806-plot.jpg
trunk/test-suite/cases/semantic/00807/00807-plot.jpg
trunk/test-suite/cases/semantic/00808/00808-plot.jpg
trunk/test-suite/cases/semantic/00809/00809-plot.jpg
trunk/test-suite/cases/semantic/00810/00810-plot.jpg
trunk/test-suite/cases/semantic/00811/00811-plot.jpg
trunk/test-suite/cases/semantic/00812/00812-plot.jpg
trunk/test-suite/cases/semantic/00813/00813-plot.jpg
trunk/test-suite/cases/semantic/00814/00814-plot.jpg
trunk/test-suite/cases/semantic/00815/00815-plot.jpg
trunk/test-suite/cases/semantic/00816/00816-plot.jpg
trunk/test-suite/cases/semantic/00817/00817-plot.jpg
trunk/test-suite/cases/semantic/00818/00818-plot.jpg
trunk/test-suite/cases/semantic/00819/00819-plot.jpg
trunk/test-suite/cases/semantic/00820/00820-plot.jpg
trunk/test-suite/cases/semantic/00821/00821-plot.jpg
trunk/test-suite/cases/semantic/00822/00822-plot.jpg
trunk/test-suite/cases/semantic/00823/00823-plot.jpg
trunk/test-suite/cases/semantic/00824/00824-plot.jpg
trunk/test-suite/cases/semantic/00825/00825-plot.jpg
trunk/test-suite/cases/semantic/00826/00826-plot.jpg
trunk/test-suite/cases/semantic/00827/00827-plot.jpg
trunk/test-suite/cases/semantic/00828/00828-plot.jpg
trunk/test-suite/cases/semantic/00829/00829-plot.jpg
trunk/test-suite/cases/semantic/00830/00830-plot.jpg
trunk/test-suite/cases/semantic/00831/00831-plot.jpg
trunk/test-suite/cases/semantic/00832/00832-plot.jpg
trunk/test-suite/cases/semantic/00833/00833-plot.jpg
trunk/test-suite/cases/semantic/00834/00834-plot.jpg
trunk/test-suite/cases/semantic/00835/00835-plot.jpg
trunk/test-suite/cases/semantic/00836/00836-plot.jpg
trunk/test-suite/cases/semantic/00837/00837-plot.jpg
trunk/test-suite/cases/semantic/00838/00838-plot.jpg
trunk/test-suite/cases/semantic/00839/00839-plot.jpg
trunk/test-suite/cases/semantic/00840/00840-plot.jpg
trunk/test-suite/cases/semantic/00841/00841-plot.jpg
trunk/test-suite/cases/semantic/00842/00842-plot.jpg
trunk/test-suite/cases/semantic/00843/00843-plot.jpg
trunk/test-suite/cases/semantic/00844/00844-plot.jpg
trunk/test-suite/cases/semantic/00845/00845-plot.jpg
trunk/test-suite/cases/semantic/00846/00846-plot.jpg
trunk/test-suite/cases/semantic/00847/00847-plot.jpg
trunk/test-suite/cases/semantic/00848/00848-plot.jpg
trunk/test-suite/cases/semantic/00849/00849-plot.jpg
trunk/test-suite/cases/semantic/00850/00850-plot.jpg
trunk/test-suite/cases/semantic/00851/00851-plot.jpg
trunk/test-suite/cases/semantic/00852/00852-plot.jpg
trunk/test-suite/cases/semantic/00853/00853-plot.jpg
trunk/test-suite/cases/semantic/00854/00854-plot.jpg
trunk/test-suite/cases/semantic/00855/00855-plot.jpg
trunk/test-suite/cases/semantic/00856/00856-plot.jpg
trunk/test-suite/cases/semantic/00857/00857-plot.jpg
trunk/test-suite/cases/semantic/00858/00858-plot.jpg
trunk/test-suite/cases/semantic/00859/00859-plot.jpg
trunk/test-suite/cases/semantic/00860/00860-plot.jpg
trunk/test-suite/cases/semantic/00861/00861-plot.jpg
trunk/test-suite/cases/semantic/00862/00862-plot.jpg
trunk/test-suite/cases/semantic/00863/00863-plot.jpg
trunk/test-suite/cases/semantic/00864/00864-plot.jpg
trunk/test-suite/cases/semantic/00865/00865-plot.jpg
trunk/test-suite/cases/semantic/00866/00866-plot.jpg
trunk/test-suite/cases/semantic/00867/00867-plot.jpg
trunk/test-suite/cases/semantic/00868/00868-plot.jpg
trunk/test-suite/cases/semantic/00869/00869-plot.jpg
trunk/test-suite/cases/semantic/00870/00870-plot.jpg
trunk/test-suite/cases/semantic/00871/00871-plot.jpg
trunk/test-suite/cases/semantic/00872/00872-plot.jpg
trunk/test-suite/cases/semantic/00873/00873-plot.jpg
trunk/test-suite/cases/semantic/00874/00874-plot.jpg
trunk/test-suite/cases/semantic/00875/00875-plot.jpg
trunk/test-suite/cases/semantic/00876/00876-plot.jpg
trunk/test-suite/cases/semantic/00877/00877-plot.jpg
trunk/test-suite/cases/semantic/00878/00878-plot.jpg
trunk/test-suite/cases/semantic/00879/00879-plot.jpg
trunk/test-suite/cases/semantic/00880/00880-plot.jpg
trunk/test-suite/cases/semantic/00881/00881-plot.jpg
trunk/test-suite/cases/semantic/00882/00882-plot.jpg
trunk/test-suite/cases/semantic/00883/00883-plot.jpg
trunk/test-suite/cases/semantic/00884/00884-plot.jpg
trunk/test-suite/cases/semantic/00885/00885-plot.jpg
trunk/test-suite/cases/semantic/00886/00886-plot.jpg
trunk/test-suite/cases/semantic/00887/00887-plot.jpg
trunk/test-suite/cases/semantic/00888/00888-plot.jpg
trunk/test-suite/cases/semantic/00889/00889-plot.jpg
trunk/test-suite/cases/semantic/00890/00890-plot.jpg
trunk/test-suite/cases/semantic/00891/00891-plot.jpg
trunk/test-suite/cases/semantic/00892/00892-plot.jpg
trunk/test-suite/cases/semantic/00893/00893-plot.jpg
trunk/test-suite/cases/semantic/00894/00894-plot.jpg
trunk/test-suite/cases/semantic/00895/00895-plot.jpg
trunk/test-suite/cases/semantic/00896/00896-plot.jpg
trunk/test-suite/cases/semantic/00897/00897-plot.jpg
trunk/test-suite/cases/semantic/00898/00898-plot.jpg
trunk/test-suite/cases/semantic/00899/00899-plot.jpg
trunk/test-suite/cases/semantic/00900/00900-plot.jpg
Modified: trunk/test-suite/cases/semantic/00001/00001-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00002/00002-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00003/00003-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00004/00004-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00005/00005-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00006/00006-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00007/00007-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00008/00008-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00009/00009-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00010/00010-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00011/00011-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00012/00012-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00013/00013-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00014/00014-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00015/00015-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00016/00016-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00017/00017-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00018/00018-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00019/00019-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00020/00020-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00021/00021-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00022/00022-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00023/00023-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00024/00024-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00025/00025-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00026/00026-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00027/00027-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00028/00028-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00029/00029-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00030/00030-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00031/00031-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00032/00032-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00033/00033-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00034/00034-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00035/00035-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00036/00036-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00037/00037-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00038/00038-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00039/00039-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00040/00040-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00041/00041-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00042/00042-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00043/00043-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00044/00044-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00045/00045-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00046/00046-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00047/00047-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00048/00048-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00049/00049-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00050/00050-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00051/00051-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00052/00052-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00053/00053-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00054/00054-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00055/00055-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00056/00056-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00057/00057-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00058/00058-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00059/00059-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/ca...
[truncated message content] |
|
From: <sar...@us...> - 2009-03-18 00:16:28
|
Revision: 9414
http://sbml.svn.sourceforge.net/sbml/?rev=9414&view=rev
Author: sarahkeating
Date: 2009-03-18 00:16:23 +0000 (Wed, 18 Mar 2009)
Log Message:
-----------
changes values used so that tolerance does not exceed machine double precision
Modified Paths:
--------------
trunk/test-suite/cases/semantic/00002/00002-model.m
trunk/test-suite/cases/semantic/00002/00002-results.csv
trunk/test-suite/cases/semantic/00002/00002-sbml-l1v2.xml
trunk/test-suite/cases/semantic/00002/00002-sbml-l2v1.xml
trunk/test-suite/cases/semantic/00002/00002-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00002/00002-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00002/00002-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00002/00002-settings.txt
trunk/test-suite/cases/semantic/00003/00003-model.m
trunk/test-suite/cases/semantic/00003/00003-results.csv
trunk/test-suite/cases/semantic/00003/00003-sbml-l1v2.xml
trunk/test-suite/cases/semantic/00003/00003-sbml-l2v1.xml
trunk/test-suite/cases/semantic/00003/00003-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00003/00003-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00003/00003-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00003/00003-settings.txt
trunk/test-suite/cases/semantic/00004/00004-model.m
trunk/test-suite/cases/semantic/00004/00004-plot.eps
trunk/test-suite/cases/semantic/00004/00004-plot.jpg
trunk/test-suite/cases/semantic/00004/00004-results.csv
trunk/test-suite/cases/semantic/00004/00004-sbml-l1v2.xml
trunk/test-suite/cases/semantic/00004/00004-sbml-l2v1.xml
trunk/test-suite/cases/semantic/00004/00004-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00004/00004-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00004/00004-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00004/00004-settings.txt
trunk/test-suite/cases/semantic/00005/00005-model.m
trunk/test-suite/cases/semantic/00005/00005-results.csv
trunk/test-suite/cases/semantic/00005/00005-sbml-l1v2.xml
trunk/test-suite/cases/semantic/00005/00005-sbml-l2v1.xml
trunk/test-suite/cases/semantic/00005/00005-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00005/00005-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00005/00005-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00005/00005-settings.txt
Modified: trunk/test-suite/cases/semantic/00002/00002-model.m
===================================================================
--- trunk/test-suite/cases/semantic/00002/00002-model.m 2009-03-18 00:05:24 UTC (rev 9413)
+++ trunk/test-suite/cases/semantic/00002/00002-model.m 2009-03-18 00:16:23 UTC (rev 9414)
@@ -23,8 +23,8 @@
The initial conditions are as follows:
[{width:30em,margin-left:5em}| |*Value* |*Units* |
-|Initial amount of S1 |$1.5 \x 10^-15$ |mole |
-|Initial amount of S2 |$0 \x$ |mole |
+|Initial amount of S1 |$1.5 \x 10^-3$ |mole |
+|Initial amount of S2 |$0$ |mole |
|Value of parameter k1 |$1$ |second^-1^ |
|Value of parameter k2 |$0$ |second^-1^ |
|Volume of compartment "compartment" |$1$ |litre |]
@@ -42,7 +42,7 @@
newcase[ "00002" ];
addCompartment[ compartment, size -> 1 ];
-addSpecies[ S1, initialAmount -> 1.5 10^-15 ];
+addSpecies[ S1, initialAmount -> 1.5 10^-3 ];
addSpecies[ S2, initialAmount -> 0 ];
addParameter[ k1, value -> 1 ];
addParameter[ k2, value -> 0 ];
Modified: trunk/test-suite/cases/semantic/00002/00002-results.csv
===================================================================
--- trunk/test-suite/cases/semantic/00002/00002-results.csv 2009-03-18 00:05:24 UTC (rev 9413)
+++ trunk/test-suite/cases/semantic/00002/00002-results.csv 2009-03-18 00:16:23 UTC (rev 9414)
@@ -1,52 +1,52 @@
-time,case00002`S1,case00002`S2
-0,1.5e-015,0
-0.1,1.35726e-015,1.42744e-016
-0.2,1.2281e-015,2.71904e-016
-0.3,1.11123e-015,3.88773e-016
-0.4,1.00548e-015,4.9452e-016
-0.5,9.09796e-016,5.90204e-016
-0.6,8.23217e-016,6.76783e-016
-0.7,7.44878e-016,7.55122e-016
-0.8,6.73993e-016,8.26007e-016
-0.9,6.09854e-016,8.90146e-016
-1,5.51819e-016,9.48181e-016
-1.1,4.99307e-016,1.00069e-015
-1.2,4.51791e-016,1.04821e-015
-1.3,4.08798e-016,1.0912e-015
-1.4,3.69895e-016,1.1301e-015
-1.5,3.34695e-016,1.1653e-015
-1.6,3.02845e-016,1.19716e-015
-1.7,2.74025e-016,1.22597e-015
-1.8,2.47948e-016,1.25205e-015
-1.9,2.24353e-016,1.27565e-015
-2,2.03003e-016,1.297e-015
-2.1,1.83685e-016,1.31632e-015
-2.2,1.66205e-016,1.3338e-015
-2.3,1.50388e-016,1.34961e-015
-2.4,1.36077e-016,1.36392e-015
-2.5,1.23127e-016,1.37687e-015
-2.6,1.1141e-016,1.38859e-015
-2.7,1.00808e-016,1.39919e-015
-2.8,9.12151e-017,1.40878e-015
-2.9,8.25348e-017,1.41747e-015
-3,7.46806e-017,1.42532e-015
-3.1,6.75738e-017,1.43243e-015
-3.2,6.11433e-017,1.43886e-015
-3.3,5.53248e-017,1.44468e-015
-3.4,5.00599e-017,1.44994e-015
-3.5,4.52961e-017,1.4547e-015
-3.6,4.09856e-017,1.45901e-015
-3.7,3.70853e-017,1.46291e-015
-3.8,3.35562e-017,1.46644e-015
-3.9,3.03629e-017,1.46964e-015
-4,2.74735e-017,1.47253e-015
-4.1,2.4859e-017,1.47514e-015
-4.2,2.24934e-017,1.47751e-015
-4.3,2.03528e-017,1.47965e-015
-4.4,1.8416e-017,1.48158e-015
-4.5,1.66635e-017,1.48334e-015
-4.6,1.50778e-017,1.48492e-015
-4.7,1.36429e-017,1.48636e-015
-4.8,1.23446e-017,1.48766e-015
-4.9,1.11699e-017,1.48883e-015
-5,1.01069e-017,1.48989e-015
\ No newline at end of file
+time,S1,S2
+0,0.0015,0
+0.1,0.001357256127053939,0.0001427438729460607
+0.2,0.001228096129616973,0.0002719038703830273
+0.3,0.001111227331022577,0.0003887726689774233
+0.4,0.001005480069053459,0.0004945199309465411
+0.5,0.0009097959895689501,0.0005902040104310499
+0.6,0.0008232174541410396,0.0006767825458589605
+0.7,0.0007448779556871142,0.0007551220443128858
+0.8,0.0006739934461758324,0.0008260065538241676
+0.9,0.0006098544896108987,0.0008901455103891014
+1,0.0005518191617571635,0.0009481808382428365
+1.1,0.0004993066255471192,0.001000693374452881
+1.2,0.0004517913178683031,0.001048208682131697
+1.3,0.0004087976895510189,0.001091202310448981
+1.4,0.0003698954459124097,0.00113010455408759
+1.5,0.0003346952402226448,0.001165304759777355
+1.6,0.0003028447769919831,0.001197155223008017
+1.7,0.0002740252860791019,0.001225974713920898
+1.8,0.0002479483323323798,0.00125205166766762
+1.9,0.0002243529288339526,0.001275647071166047
+2,0.000203002924854919,0.001296997075145081
+2.1,0.0001836846423794728,0.001316315357620527
+2.2,0.0001662047375435008,0.001333795262456499
+2.3,0.0001503882655842056,0.001349611734415794
+2.4,0.0001360769299341187,0.001363923070065881
+2.5,0.0001231274979358482,0.001376872502064152
+2.6,0.0001114103673215008,0.001388589632678499
+2.7,0.0001008082691096246,0.001399191730890375
+2.8,9.121509393782692e-005,0.001408784906062173
+2.9,8.253483008461081e-005,0.001417465169915389
+3,7.468060255179592e-005,0.001425319397448204
+3.1,6.75738035903367e-005,0.001432426196409663
+3.2,6.114330596754932e-005,0.001438856694032451
+3.3,5.532475110186e-005,0.00144467524889814
+3.4,5.00599049404891e-005,0.001449940095059511
+3.5,4.529607513347775e-005,0.001454703924866522
+3.6,4.098558367093884e-005,0.001459014416329061
+3.7,3.708528970550908e-005,0.001462914710294491
+3.8,3.355615778424838e-005,0.001466443842215752
+3.9,3.036286716870657e-005,0.001469637132831294
+4,2.747345833310127e-005,0.001472526541666899
+4.1,2.485901310264186e-005,0.001475140986897358
+4.2,2.249336523071656e-005,0.001477506634769284
+4.3,2.03528385183014e-005,0.001479647161481699
+4.4,1.841600985460266e-005,0.001481583990145397
+4.5,1.666349480736346e-005,0.001483336505192637
+4.6,1.507775361695037e-005,0.00148492224638305
+4.7,1.364291565254372e-005,0.001486357084347456
+4.8,1.234462057353003e-005,0.00148765537942647
+4.9,1.116987460638651e-005,0.001488830125393614
+5,1.01069204986282e-005,0.001489893079501372
Modified: trunk/test-suite/cases/semantic/00002/00002-sbml-l1v2.xml
===================================================================
--- trunk/test-suite/cases/semantic/00002/00002-sbml-l1v2.xml 2009-03-18 00:05:24 UTC (rev 9413)
+++ trunk/test-suite/cases/semantic/00002/00002-sbml-l1v2.xml 2009-03-18 00:16:23 UTC (rev 9414)
@@ -5,7 +5,7 @@
<compartment name="compartment" volume="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species name="S1" compartment="compartment" initialAmount="1.5e-015" units="substance"/>
+ <species name="S1" compartment="compartment" initialAmount="0.0015" units="substance"/>
<species name="S2" compartment="compartment" initialAmount="0" units="substance"/>
</listOfSpecies>
<listOfParameters>
Modified: trunk/test-suite/cases/semantic/00002/00002-sbml-l2v1.xml
===================================================================
--- trunk/test-suite/cases/semantic/00002/00002-sbml-l2v1.xml 2009-03-18 00:05:24 UTC (rev 9413)
+++ trunk/test-suite/cases/semantic/00002/00002-sbml-l2v1.xml 2009-03-18 00:16:23 UTC (rev 9414)
@@ -5,7 +5,7 @@
<compartment id="compartment" name="compartment" size="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1.5e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.0015" substanceUnits="substance"/>
<species id="S2" name="S2" compartment="compartment" initialAmount="0" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
Modified: trunk/test-suite/cases/semantic/00002/00002-sbml-l2v2.xml
===================================================================
--- trunk/test-suite/cases/semantic/00002/00002-sbml-l2v2.xml 2009-03-18 00:05:24 UTC (rev 9413)
+++ trunk/test-suite/cases/semantic/00002/00002-sbml-l2v2.xml 2009-03-18 00:16:23 UTC (rev 9414)
@@ -5,7 +5,7 @@
<compartment id="compartment" name="compartment" size="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1.5e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.0015" substanceUnits="substance"/>
<species id="S2" name="S2" compartment="compartment" initialAmount="0" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
Modified: trunk/test-suite/cases/semantic/00002/00002-sbml-l2v3.xml
===================================================================
--- trunk/test-suite/cases/semantic/00002/00002-sbml-l2v3.xml 2009-03-18 00:05:24 UTC (rev 9413)
+++ trunk/test-suite/cases/semantic/00002/00002-sbml-l2v3.xml 2009-03-18 00:16:23 UTC (rev 9414)
@@ -25,7 +25,7 @@
compartment="compartment"
boundaryCondition="false"
constant="false"
- initialAmount="1.5000000000000001e-15"
+ initialAmount="1.5e-3"
substanceUnits="substance"
hasOnlySubstanceUnits="false"/>
<species id="S2"
Modified: trunk/test-suite/cases/semantic/00002/00002-sbml-l2v4.xml
===================================================================
--- trunk/test-suite/cases/semantic/00002/00002-sbml-l2v4.xml 2009-03-18 00:05:24 UTC (rev 9413)
+++ trunk/test-suite/cases/semantic/00002/00002-sbml-l2v4.xml 2009-03-18 00:16:23 UTC (rev 9414)
@@ -5,7 +5,7 @@
<compartment id="compartment" name="compartment" size="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1.5e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.0015" substanceUnits="substance"/>
<species id="S2" name="S2" compartment="compartment" initialAmount="0" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
Modified: trunk/test-suite/cases/semantic/00002/00002-settings.txt
===================================================================
--- trunk/test-suite/cases/semantic/00002/00002-settings.txt 2009-03-18 00:05:24 UTC (rev 9413)
+++ trunk/test-suite/cases/semantic/00002/00002-settings.txt 2009-03-18 00:16:23 UTC (rev 9414)
@@ -2,7 +2,7 @@
duration: 5.0
steps: 50
variables: S1, S2
-absolute: 1e-19
+absolute: 1.000000e-006
relative: 0.0001
amount: S1, S2
concentration:
Modified: trunk/test-suite/cases/semantic/00003/00003-model.m
===================================================================
--- trunk/test-suite/cases/semantic/00003/00003-model.m 2009-03-18 00:05:24 UTC (rev 9413)
+++ trunk/test-suite/cases/semantic/00003/00003-model.m 2009-03-18 00:16:23 UTC (rev 9414)
@@ -21,7 +21,7 @@
The initial conditions are as follows:
[{width:30em,margin-left:5em}| |*Value* |*Units* |
-|Initial amount of S1 |$1.5 \x 10^-15$ |mole |
+|Initial amount of S1 |$1.5 \x 10^-2$ |mole |
|Initial amount of S2 |$0$ |mole |
|Value of parameter k1 |$1$ |second^-1^ |
|Volume of compartment "compartment" |$1$ |litre |]
@@ -39,7 +39,7 @@
newcase[ "00003" ];
addCompartment[ compartment, size -> 1 ];
-addSpecies[ S1, initialAmount -> 1.5 10^-15 ];
+addSpecies[ S1, initialAmount -> 1.5 10^-2 ];
addSpecies[ S2, initialAmount -> 0 ];
addParameter[ k1, value -> 1 ];
addReaction[ S1 -> 2 S2, reversible -> False,
Modified: trunk/test-suite/cases/semantic/00003/00003-results.csv
===================================================================
--- trunk/test-suite/cases/semantic/00003/00003-results.csv 2009-03-18 00:05:24 UTC (rev 9413)
+++ trunk/test-suite/cases/semantic/00003/00003-results.csv 2009-03-18 00:16:23 UTC (rev 9414)
@@ -1,52 +1,52 @@
-time,case00003`S1,case00003`S2
-0,1.5e-015,0
-0.1,1.35726e-015,2.85488e-016
-0.2,1.2281e-015,5.43808e-016
-0.3,1.11123e-015,7.77545e-016
-0.4,1.00548e-015,9.8904e-016
-0.5,9.09796e-016,1.18041e-015
-0.6,8.23217e-016,1.35357e-015
-0.7,7.44878e-016,1.51024e-015
-0.8,6.73993e-016,1.65201e-015
-0.9,6.09854e-016,1.78029e-015
-1,5.51819e-016,1.89636e-015
-1.1,4.99307e-016,2.00139e-015
-1.2,4.51791e-016,2.09642e-015
-1.3,4.08798e-016,2.1824e-015
-1.4,3.69895e-016,2.26021e-015
-1.5,3.34695e-016,2.33061e-015
-1.6,3.02845e-016,2.39431e-015
-1.7,2.74025e-016,2.45195e-015
-1.8,2.47948e-016,2.5041e-015
-1.9,2.24353e-016,2.55129e-015
-2,2.03003e-016,2.59399e-015
-2.1,1.83685e-016,2.63263e-015
-2.2,1.66205e-016,2.66759e-015
-2.3,1.50388e-016,2.69922e-015
-2.4,1.36077e-016,2.72785e-015
-2.5,1.23127e-016,2.75375e-015
-2.6,1.1141e-016,2.77718e-015
-2.7,1.00808e-016,2.79838e-015
-2.8,9.12151e-017,2.81757e-015
-2.9,8.25348e-017,2.83493e-015
-3,7.46806e-017,2.85064e-015
-3.1,6.75738e-017,2.86485e-015
-3.2,6.11433e-017,2.87771e-015
-3.3,5.53248e-017,2.88935e-015
-3.4,5.00599e-017,2.89988e-015
-3.5,4.52961e-017,2.90941e-015
-3.6,4.09856e-017,2.91803e-015
-3.7,3.70853e-017,2.92583e-015
-3.8,3.35562e-017,2.93289e-015
-3.9,3.03629e-017,2.93927e-015
-4,2.74735e-017,2.94505e-015
-4.1,2.4859e-017,2.95028e-015
-4.2,2.24934e-017,2.95501e-015
-4.3,2.03528e-017,2.95929e-015
-4.4,1.8416e-017,2.96317e-015
-4.5,1.66635e-017,2.96667e-015
-4.6,1.50778e-017,2.96984e-015
-4.7,1.36429e-017,2.97271e-015
-4.8,1.23446e-017,2.97531e-015
-4.9,1.11699e-017,2.97766e-015
-5,1.01069e-017,2.97979e-015
\ No newline at end of file
+time,S1,S2
+0,0.015,0
+0.1,0.01357256127053939,0.002854877458921213
+0.2,0.01228096129616973,0.005438077407660545
+0.3,0.01111227331022577,0.007775453379548465
+0.4,0.01005480069053459,0.009890398618930821
+0.5,0.009097959895689501,0.011804080208621
+0.6,0.008232174541410396,0.01353565091717921
+0.7,0.007448779556871142,0.01510244088625772
+0.8,0.006739934461758324,0.01652013107648335
+0.9,0.006098544896108987,0.01780291020778203
+1,0.005518191617571635,0.01896361676485673
+1.1,0.004993066255471193,0.02001386748905762
+1.2,0.00451791317868303,0.02096417364263394
+1.3,0.004087976895510189,0.02182404620897962
+1.4,0.003698954459124097,0.02260209108175181
+1.5,0.003346952402226447,0.02330609519554711
+1.6,0.003028447769919831,0.02394310446016034
+1.7,0.002740252860791019,0.02451949427841796
+1.8,0.002479483323323798,0.0250410333533524
+1.9,0.002243529288339526,0.02551294142332095
+2,0.00203002924854919,0.02593994150290162
+2.1,0.001836846423794729,0.02632630715241054
+2.2,0.001662047375435008,0.02667590524912998
+2.3,0.001503882655842056,0.02699223468831589
+2.4,0.001360769299341187,0.02727846140131763
+2.5,0.001231274979358482,0.02753745004128304
+2.6,0.001114103673215008,0.02777179265356998
+2.7,0.001008082691096246,0.02798383461780751
+2.8,0.0009121509393782692,0.02817569812124346
+2.9,0.0008253483008461082,0.02834930339830779
+3,0.0007468060255179592,0.02850638794896408
+3.1,0.000675738035903367,0.02864852392819327
+3.2,0.0006114330596754932,0.02877713388064902
+3.3,0.0005532475110185999,0.0288935049779628
+3.4,0.000500599049404891,0.02899880190119022
+3.5,0.0004529607513347775,0.02909407849733045
+3.6,0.0004098558367093884,0.02918028832658122
+3.7,0.0003708528970550908,0.02925829420588982
+3.8,0.0003355615778424838,0.02932887684431503
+3.9,0.0003036286716870657,0.02939274265662587
+4,0.0002747345833310127,0.02945053083333797
+4.1,0.0002485901310264186,0.02950281973794716
+4.2,0.0002249336523071656,0.02955013269538567
+4.3,0.000203528385183014,0.02959294322963397
+4.4,0.0001841600985460266,0.02963167980290795
+4.5,0.0001666349480736346,0.02966673010385273
+4.6,0.0001507775361695037,0.02969844492766099
+4.7,0.0001364291565254372,0.02972714168694913
+4.8,0.0001234462057353003,0.0297531075885294
+4.9,0.0001116987460638651,0.02977660250787227
+5,0.000101069204986282,0.02979786159002744
Modified: trunk/test-suite/cases/semantic/00003/00003-sbml-l1v2.xml
===================================================================
--- trunk/test-suite/cases/semantic/00003/00003-sbml-l1v2.xml 2009-03-18 00:05:24 UTC (rev 9413)
+++ trunk/test-suite/cases/semantic/00003/00003-sbml-l1v2.xml 2009-03-18 00:16:23 UTC (rev 9414)
@@ -5,7 +5,7 @@
<compartment name="compartment" volume="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species name="S1" compartment="compartment" initialAmount="1.5e-015" units="substance"/>
+ <species name="S1" compartment="compartment" initialAmount="0.015" units="substance"/>
<species name="S2" compartment="compartment" initialAmount="0" units="substance"/>
</listOfSpecies>
<listOfParameters>
Modified: trunk/test-suite/cases/semantic/00003/00003-sbml-l2v1.xml
===================================================================
--- trunk/test-suite/cases/semantic/00003/00003-sbml-l2v1.xml 2009-03-18 00:05:24 UTC (rev 9413)
+++ trunk/test-suite/cases/semantic/00003/00003-sbml-l2v1.xml 2009-03-18 00:16:23 UTC (rev 9414)
@@ -5,7 +5,7 @@
<compartment id="compartment" name="compartment" size="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1.5e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.015" substanceUnits="substance"/>
<species id="S2" name="S2" compartment="compartment" initialAmount="0" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
Modified: trunk/test-suite/cases/semantic/00003/00003-sbml-l2v2.xml
===================================================================
--- trunk/test-suite/cases/semantic/00003/00003-sbml-l2v2.xml 2009-03-18 00:05:24 UTC (rev 9413)
+++ trunk/test-suite/cases/semantic/00003/00003-sbml-l2v2.xml 2009-03-18 00:16:23 UTC (rev 9414)
@@ -5,7 +5,7 @@
<compartment id="compartment" name="compartment" size="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1.5e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.015" substanceUnits="substance"/>
<species id="S2" name="S2" compartment="compartment" initialAmount="0" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
Modified: trunk/test-suite/cases/semantic/00003/00003-sbml-l2v3.xml
===================================================================
--- trunk/test-suite/cases/semantic/00003/00003-sbml-l2v3.xml 2009-03-18 00:05:24 UTC (rev 9413)
+++ trunk/test-suite/cases/semantic/00003/00003-sbml-l2v3.xml 2009-03-18 00:16:23 UTC (rev 9414)
@@ -25,7 +25,7 @@
compartment="compartment"
boundaryCondition="false"
constant="false"
- initialAmount="1.5000000000000001e-15"
+ initialAmount="1.5e-2"
substanceUnits="substance"
hasOnlySubstanceUnits="false"/>
<species id="S2"
Modified: trunk/test-suite/cases/semantic/00003/00003-sbml-l2v4.xml
===================================================================
--- trunk/test-suite/cases/semantic/00003/00003-sbml-l2v4.xml 2009-03-18 00:05:24 UTC (rev 9413)
+++ trunk/test-suite/cases/semantic/00003/00003-sbml-l2v4.xml 2009-03-18 00:16:23 UTC (rev 9414)
@@ -5,7 +5,7 @@
<compartment id="compartment" name="compartment" size="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1.5e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.015" substanceUnits="substance"/>
<species id="S2" name="S2" compartment="compartment" initialAmount="0" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
Modified: trunk/test-suite/cases/semantic/00003/00003-settings.txt
===================================================================
--- trunk/test-suite/cases/semantic/00003/00003-settings.txt 2009-03-18 00:05:24 UTC (rev 9413)
+++ trunk/test-suite/cases/semantic/00003/00003-settings.txt 2009-03-18 00:16:23 UTC (rev 9414)
@@ -2,7 +2,7 @@
duration: 5.0
steps: 50
variables: S1, S2
-absolute: 1e-19
+absolute: 1.000000e-005
relative: 0.0001
amount: S1, S2
concentration:
Modified: trunk/test-suite/cases/semantic/00004/00004-model.m
===================================================================
--- trunk/test-suite/cases/semantic/00004/00004-model.m 2009-03-18 00:05:24 UTC (rev 9413)
+++ trunk/test-suite/cases/semantic/00004/00004-model.m 2009-03-18 00:16:23 UTC (rev 9414)
@@ -23,7 +23,7 @@
The initial conditions are as follows:
[{width:30em,margin-left:5em}| |*Value* |*Units* |
-|Initial amount of S1 |$1.5 \x 10^-15$ |mole |
+|Initial amount of S1 |$1.5 \x 10^-1$ |mole |
|Initial amount of S2 |$0$ |mole |
|Value of parameter k1 |$0.35$ |second^-1^ |
|Value of parameter k2 |$180$ |litre mole^-1^ second^-1^ |
@@ -39,7 +39,7 @@
newcase[ "00004" ];
addCompartment[ compartment, size -> 1 ];
-addSpecies[ S1, initialAmount -> 1.5 10^-15 ];
+addSpecies[ S1, initialAmount -> 1.5 10^-1 ];
addSpecies[ S2, initialAmount -> 0 ];
addParameter[ k1, value -> 0.35 ];
addParameter[ k2, value -> 180 ];
Modified: trunk/test-suite/cases/semantic/00004/00004-plot.eps
===================================================================
--- trunk/test-suite/cases/semantic/00004/00004-plot.eps 2009-03-18 00:05:24 UTC (rev 9413)
+++ trunk/test-suite/cases/semantic/00004/00004-plot.eps 2009-03-18 00:16:23 UTC (rev 9414)
@@ -2,16 +2,13 @@
%%BoundingBox: 88 4 376 144
%%HiResBoundingBox: 88 4 376 143.563
%%Creator: (Mathematica 5.2 for Microsoft Windows)
-%%CreationDate: (Tuesday, February 5, 2008) (11:12:14)
+%%CreationDate: (Tuesday, March 17, 2009) (17:12:14)
%%Title: Clipboard
-%%DocumentNeededResources: font Math1Mono
-%%+ font Courier
+%%DocumentNeededResources: font Courier
%%DocumentSuppliedResources:
-%%DocumentNeededFonts: Math1Mono
-%%+ Courier
+%%DocumentNeededFonts: Courier
%%DocumentSuppliedFonts:
-%%DocumentFonts: Math1Mono
-%%+ Courier
+%%DocumentFonts: Courier
%%EndComments
0 147.563 translate 1 -1 scale
150 dict begin
@@ -1173,11 +1170,11 @@
/Y {0 exch rmoveto} bind def
gsave
newpath
- 143.313 110.313 moveto
- 277.500 110.313 lineto
- 277.500 27.438 lineto
- 143.313 27.438 lineto
- 143.313 110.313 lineto
+ 117.563 118.125 moveto
+ 276.875 118.125 lineto
+ 276.875 19.688 lineto
+ 117.563 19.688 lineto
+ 117.563 118.125 lineto
closepath
clip newpath
grestore
@@ -1380,29 +1377,37 @@
%%IncludeFont: Courier
/Courier findfont 10 scalefont setfont
% Scaling calculations
-0.0238095 0.0952381 0.0147151 2.02311e+014 [
-[.21429 .00222 -3 -9 ]
-[.21429 .00222 3 0 ]
-[.40476 .00222 -3 -9 ]
-[.40476 .00222 3 0 ]
-[.59524 .00222 -3 -9 ]
-[.59524 .00222 3 0 ]
-[.78571 .00222 -3 -9 ]
-[.78571 .00222 3 0 ]
-[.97619 .00222 -6 -9 ]
-[.97619 .00222 6 0 ]
-[1.025 .01472 0 -6.4375 ]
-[1.025 .01472 28 6.4375 ]
-[.01131 .11587 -37.5 -6.25 ]
-[.01131 .11587 0 6.25 ]
-[.01131 .21703 -37.5 -6.25 ]
-[.01131 .21703 0 6.25 ]
-[.01131 .31818 -49.5 -6.25 ]
-[.01131 .31818 0 6.25 ]
-[.01131 .41934 -37.5 -6.25 ]
-[.01131 .41934 0 6.25 ]
-[.01131 .52049 -49.5 -6.25 ]
-[.01131 .52049 0 6.25 ]
+0.0238095 0.130255 0.0147151 3.92403 [
+[.15406 .00222 -3 -9 ]
+[.15406 .00222 3 0 ]
+[.28432 .00222 -3 -9 ]
+[.28432 .00222 3 0 ]
+[.41457 .00222 -3 -9 ]
+[.41457 .00222 3 0 ]
+[.54483 .00222 -3 -9 ]
+[.54483 .00222 3 0 ]
+[.67508 .00222 -3 -9 ]
+[.67508 .00222 3 0 ]
+[.80534 .00222 -3 -9 ]
+[.80534 .00222 3 0 ]
+[.93559 .00222 -3 -9 ]
+[.93559 .00222 3 0 ]
+[1.025 .01472 0 -6.25 ]
+[1.025 .01472 28 6.25 ]
+[.01131 .0932 -24 -4.5 ]
+[.01131 .0932 0 4.5 ]
+[.01131 .17168 -24 -4.5 ]
+[.01131 .17168 0 4.5 ]
+[.01131 .25016 -24 -4.5 ]
+[.01131 .25016 0 4.5 ]
+[.01131 .32864 -24 -4.5 ]
+[.01131 .32864 0 4.5 ]
+[.01131 .40712 -18 -4.5 ]
+[.01131 .40712 0 4.5 ]
+[.01131 .4856 -24 -4.5 ]
+[.01131 .4856 0 4.5 ]
+[.01131 .56408 -24 -4.5 ]
+[.01131 .56408 0 4.5 ]
[ 0 0 0 0 ]
[ 1 .61803 0 0 ]
] MathScale
@@ -1413,81 +1418,134 @@
0 g
.25 Mabswid
[ ] 0 setdash
-.21429 .01472 m
-.21429 .02097 L
+.15406 .01472 m
+.15406 .02097 L
s
-[(2)] .21429 .00222 0 1 Mshowa
-.40476 .01472 m
-.40476 .02097 L
+[(1)] .15406 .00222 0 1 Mshowa
+.28432 .01472 m
+.28432 .02097 L
s
-[(4)] .40476 .00222 0 1 Mshowa
-.59524 .01472 m
-.59524 .02097 L
+[(2)] .28432 .00222 0 1 Mshowa
+.41457 .01472 m
+.41457 .02097 L
s
-[(6)] .59524 .00222 0 1 Mshowa
-.78571 .01472 m
-.78571 .02097 L
+[(3)] .41457 .00222 0 1 Mshowa
+.54483 .01472 m
+.54483 .02097 L
s
-[(8)] .78571 .00222 0 1 Mshowa
-.97619 .01472 m
-.97619 .02097 L
+[(4)] .54483 .00222 0 1 Mshowa
+.67508 .01472 m
+.67508 .02097 L
s
-[(10)] .97619 .00222 0 1 Mshowa
+[(5)] .67508 .00222 0 1 Mshowa
+.80534 .01472 m
+.80534 .02097 L
+s
+[(6)] .80534 .00222 0 1 Mshowa
+.93559 .01472 m
+.93559 .02097 L
+s
+[(7)] .93559 .00222 0 1 Mshowa
.125 Mabswid
-.07143 .01472 m
-.07143 .01847 L
+.04986 .01472 m
+.04986 .01847 L
s
-.11905 .01472 m
-.11905 .01847 L
+.07591 .01472 m
+.07591 .01847 L
s
-.16667 .01472 m
-.16667 .01847 L
+.10196 .01472 m
+.10196 .01847 L
s
-.2619 .01472 m
-.2619 .01847 L
+.12801 .01472 m
+.12801 .01847 L
s
-.30952 .01472 m
-.30952 .01847 L
+.18012 .01472 m
+.18012 .01847 L
s
-.35714 .01472 m
-.35714 .01847 L
+.20617 .01472 m
+.20617 .01847 L
s
-.45238 .01472 m
-.45238 .01847 L
+.23222 .01472 m
+.23222 .01847 L
s
-.5 .01472 m
-.5 .01847 L
+.25827 .01472 m
+.25827 .01847 L
s
-.54762 .01472 m
-.54762 .01847 L
+.31037 .01472 m
+.31037 .01847 L
s
-.64286 .01472 m
-.64286 .01847 L
+.33642 .01472 m
+.33642 .01847 L
s
-.69048 .01472 m
-.69048 .01847 L
+.36247 .01472 m
+.36247 .01847 L
s
-.7381 .01472 m
-.7381 .01847 L
+.38852 .01472 m
+.38852 .01847 L
s
-.83333 .01472 m
-.83333 .01847 L
+.44063 .01472 m
+.44063 .01847 L
s
-.88095 .01472 m
-.88095 .01847 L
+.46668 .01472 m
+.46668 .01847 L
s
-.92857 .01472 m
-.92857 .01847 L
+.49273 .01472 m
+.49273 .01847 L
s
+.51878 .01472 m
+.51878 .01847 L
+s
+.57088 .01472 m
+.57088 .01847 L
+s
+.59693 .01472 m
+.59693 .01847 L
+s
+.62298 .01472 m
+.62298 .01847 L
+s
+.64903 .01472 m
+.64903 .01847 L
+s
+.70114 .01472 m
+.70114 .01847 L
+s
+.72719 .01472 m
+.72719 .01847 L
+s
+.75324 .01472 m
+.75324 .01847 L
+s
+.77929 .01472 m
+.77929 .01847 L
+s
+.83139 .01472 m
+.83139 .01847 L
+s
+.85744 .01472 m
+.85744 .01847 L
+s
+.88349 .01472 m
+.88349 .01847 L
+s
+.90954 .01472 m
+.90954 .01847 L
+s
+.96165 .01472 m
+.96165 .01847 L
+s
+.9877 .01472 m
+.9877 .01847 L
+s
.25 Mabswid
0 .01472 m
1 .01472 L
s
gsave
-1.025 .01472 -61 -10.4375 Mabsadd m
+1.025 .01472 -61 -10.25 Mabsadd m
1 1 Mabs scale
currentpoint translate
-0 20.875 translate 1 -1 scale
+0 20.5 translate 1 -1 scale
/g { setgray} bind def
/k { setcmykcolor} bind def
/p { gsave} bind def
@@ -1508,21 +1566,21 @@
/My {currentpoint pop exch moveto} bind def
/X {0 rmoveto} bind def
/Y {0 exch rmoveto} bind def
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
0.000 0.000 rmoveto
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
(Time) show
-87.000 13.000 moveto
+87.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
@@ -1531,159 +1589,104 @@
0.000 0.000 rmoveto
1.000 setlinewidth
grestore
-.02381 .11587 m
-.03006 .11587 L
+.02381 .0932 m
+.03006 .0932 L
s
-gsave
-.01131 .11587 -37.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(5) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-16) show
-grestore
-.02381 .21703 m
-.03006 .21703 L
+[(0.02)] .01131 .0932 1 0 Mshowa
+.02381 .17168 m
+.03006 .17168 L
s
-gsave
-.01131 .21703 -37.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(1) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
-.02381 .31818 m
-.03006 .31818 L
+[(0.04)] .01131 .17168 1 0 Mshowa
+.02381 .25016 m
+.03006 .25016 L
s
-gsave
-.01131 .31818 -49.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(1.5) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
-.02381 .41934 m
-.03006 .41934 L
+[(0.06)] .01131 .25016 1 0 Mshowa
+.02381 .32864 m
+.03006 .32864 L
s
-gsave
-.01131 .41934 -37.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(2) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
-.02381 .52049 m
-.03006 .52049 L
+[(0.08)] .01131 .32864 1 0 Mshowa
+.02381 .40712 m
+.03006 .40712 L
s
-gsave
-.01131 .52049 -49.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(2.5) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
+[(0.1)] .01131 .40712 1 0 Mshowa
+.02381 .4856 m
+.03006 .4856 L
+s
+[(0.12)] .01131 .4856 1 0 Mshowa
+.02381 .56408 m
+.03006 .56408 L
+s
+[(0.14)] .01131 .56408 1 0 Mshowa
.125 Mabswid
-.02381 .03495 m
-.02756 .03495 L
+.02381 .03434 m
+.02756 .03434 L
s
-.02381 .05518 m
-.02756 .05518 L
+.02381 .05396 m
+.02756 .05396 L
s
-.02381 .07541 m
-.02756 .07541 L
+.02381 .07358 m
+.02756 .07358 L
s
-.02381 .09564 m
-.02756 .09564 L
+.02381 .11282 m
+.02756 .11282 L
s
-.02381 .1361 m
-.02756 .1361 L
+.02381 .13244 m
+.02756 .13244 L
s
-.02381 .15633 m
-.02756 .15633 L
+.02381 .15206 m
+.02756 .15206 L
s
-.02381 .17656 m
-.02756 .17656 L
+.02381 .1913 m
+.02756 .1913 L
s
-.02381 .19679 m
-.02756 .19679 L
+.02381 .21092 m
+.02756 .21092 L
s
-.02381 .23726 m
-.02756 .23726 L
+.02381 .23054 m
+.02756 .23054 L
s
-.02381 .25749 m
-.02756 .25749 L
+.02381 .26978 m
+.02756 .26978 L
s
-.02381 .27772 m
-.02756 .27772 L
+.02381 .2894 m
+.02756 .2894 L
s
-.02381 .29795 m
-.02756 .29795 L
+.02381 .30902 m
+.02756 .30902 L
s
-.02381 .33841 m
-.02756 .33841 L
+.02381 .34826 m
+.02756 .34826 L
s
-.02381 .35864 m
-.02756 .35864 L
+.02381 .36788 m
+.02756 .36788 L
s
-.02381 .37887 m
-.02756 .37887 L
+.02381 .3875 m
+.02756 .3875 L
s
-.02381 .39911 m
-.02756 .39911 L
+.02381 .42674 m
+.02756 .42674 L
s
-.02381 .43957 m
-.02756 .43957 L
+.02381 .44636 m
+.02756 .44636 L
s
-.02381 .4598 m
-.02756 .4598 L
+.02381 .46598 m
+.02756 .46598 L
s
-.02381 .48003 m
-.02756 .48003 L
+.02381 .50522 m
+.02756 .50522 L
s
-.02381 .50026 m
-.02756 .50026 L
+.02381 .52484 m
+.02756 .52484 L
s
-.02381 .54072 m
-.02756 .54072 L
+.02381 .54446 m
+.02756 .54446 L
s
-.02381 .56095 m
-.02756 .56095 L
+.02381 .5837 m
+.02756 .5837 L
s
-.02381 .58118 m
-.02756 .58118 L
+.02381 .60332 m
+.02756 .60332 L
s
-.02381 .60142 m
-.02756 .60142 L
-s
.25 Mabswid
.02381 0 m
.02381 .61803 L
@@ -1697,58 +1700,380 @@
newpath
0 1 1 r
.5 Mabswid
-.02381 .31818 m
-.06244 .27801 L
-.10458 .24024 L
-.14415 .20972 L
-.18221 .18427 L
-.22272 .16081 L
-.26171 .14131 L
-.30316 .12342 L
-.34309 .10859 L
-.3815 .09623 L
-.42237 .08486 L
-.46172 .07542 L
-.49955 .06754 L
-.53984 .06027 L
-.57861 .05422 L
-.61984 .04866 L
-.65954 .04405 L
-.69774 .04021 L
-.73838 .03667 L
-.77751 .03373 L
-.81909 .03104 L
-.85916 .0288 L
-.89771 .02694 L
-.93871 .02523 L
-.97619 .02388 L
+.02381 .60332 m
+.03017 .59364 L
+.03609 .58608 L
+.04258 .58002 L
+.04622 .5776 L
+.04953 .5759 L
+.05301 .57454 L
+.05622 .57359 L
+.05974 .57281 L
+.06347 .57221 L
+.06671 .57184 L
+.06974 .57157 L
+.07307 .57135 L
+.07665 .57118 L
+.08048 .57105 L
+.08403 .57097 L
+.08792 .5709 L
+.0901 .57087 L
+.09208 .57085 L
+.09571 .57082 L
+.09775 .57081 L
+.09963 .5708 L
+.10309 .57079 L
+.10674 .57078 L
+.11002 .57077 L
+.11353 .57076 L
+.11685 .57076 L
+.11987 .57076 L
+.12341 .57076 L
+.12528 .57076 L
+.12727 .57076 L
+.13091 .57075 L
+.13428 .57075 L
+.13753 .57075 L
+.14096 .57075 L
+.14389 .57075 L
+.14709 .57075 L
+.15055 .57075 L
+.15425 .57075 L
+.15774 .57075 L
+.16091 .57075 L
+.16412 .57075 L
+.16708 .57075 L
+.17033 .57075 L
+.17377 .57075 L
+.17675 .57075 L
+.17955 .57075 L
+.18261 .57075 L
+.18591 .57075 L
+.18939 .57075 L
+Mistroke
+.1931 .57075 L
+.1966 .57075 L
+.19976 .57075 L
+.2035 .57075 L
+.20561 .57075 L
+.20755 .57075 L
+.21111 .57075 L
+.21487 .57075 L
+.21815 .57075 L
+.22166 .57075 L
+.22497 .57075 L
+.22798 .57075 L
+.23152 .57075 L
+.23339 .57075 L
+.23537 .57075 L
+.239 .57075 L
+.24236 .57075 L
+.24563 .57075 L
+.24907 .57075 L
+.252 .57075 L
+.25521 .57075 L
+.25868 .57075 L
+.26238 .57075 L
+.26588 .57075 L
+.26904 .57075 L
+.27226 .57075 L
+.27523 .57075 L
+.27848 .57075 L
+.28192 .57075 L
+.28491 .57075 L
+.28771 .57075 L
+.29077 .57075 L
+.29406 .57075 L
+.29756 .57075 L
+.30128 .57075 L
+.30445 .57075 L
+.30795 .57075 L
+.30991 .57075 L
+.31171 .57075 L
+.31575 .57075 L
+.31932 .57075 L
+.32111 .57075 L
+.32308 .57075 L
+.32493 .57075 L
+.32668 .57075 L
+.32996 .57075 L
+.33168 .57075 L
+.33349 .57075 L
+.33549 .57075 L
+.33732 .57075 L
+Mistroke
+.34058 .57075 L
+.34364 .57075 L
+.34724 .57075 L
+.349 .57075 L
+.35059 .57075 L
+.35228 .57075 L
+.35388 .57075 L
+.35556 .57075 L
+.35738 .57075 L
+.36099 .57075 L
+.36281 .57075 L
+.3648 .57075 L
+.36655 .57075 L
+.36844 .57075 L
+.37183 .57075 L
+.37357 .57075 L
+.37522 .57075 L
+.3783 .57075 L
+.38136 .57075 L
+.38461 .57075 L
+.38738 .57075 L
+.39044 .57075 L
+.39372 .57075 L
+.39725 .57075 L
+.40059 .57075 L
+.40364 .57075 L
+.41063 .57075 L
+.41723 .57075 L
+.42088 .57075 L
+.42483 .57075 L
+.42658 .57075 L
+.42843 .57075 L
+.43174 .57075 L
+.43333 .57075 L
+.43484 .57075 L
+.43658 .57075 L
+.43817 .57075 L
+.44105 .57075 L
+.44418 .57075 L
+.45786 .57075 L
+.46462 .57075 L
+.47097 .57075 L
+.4783 .57075 L
+.48493 .57075 L
+.51001 .57075 L
+.56283 .57075 L
+.61901 .57075 L
+.67312 .57075 L
+.72515 .57075 L
+.78053 .57075 L
+Mistroke
+.83385 .57075 L
+.89051 .57075 L
+.94511 .57075 L
+.99763 .57075 L
+Mfstroke
+.99763 .57075 m
+1 .57075 L
s
1 0 0 r
.02381 .01472 m
-.06244 .09505 L
-.10458 .17059 L
-.14415 .23164 L
-.18221 .28254 L
-.22272 .32945 L
-.26171 .36846 L
-.30316 .40423 L
-.34309 .4339 L
-.3815 .45862 L
-.42237 .48136 L
-.46172 .50024 L
-.49955 .516 L
-.53984 .53054 L
-.57861 .54264 L
-.61984 .55375 L
-.65954 .56297 L
-.69774 .57065 L
-.73838 .57773 L
-.77751 .58361 L
-.81909 .589 L
-.85916 .59347 L
-.89771 .59719 L
-.93871 .60061 L
-.97619 .60332 L
+.03017 .03408 L
+.03609 .0492 L
+.04258 .06131 L
+.04622 .06615 L
+.04953 .06955 L
+.05301 .07227 L
+.05622 .07417 L
+.05974 .07572 L
+.06347 .07692 L
+.06671 .07768 L
+.06974 .07822 L
+.07307 .07865 L
+.07665 .07899 L
+.08048 .07925 L
+.08403 .07942 L
+.08792 .07955 L
+.0901 .07961 L
+.09208 .07965 L
+.09571 .07971 L
+.09775 .07973 L
+.09963 .07975 L
+.10309 .07978 L
+.10674 .0798 L
+.11002 .07981 L
+.11353 .07982 L
+.11685 .07983 L
+.11987 .07984 L
+.12341 .07984 L
+.12528 .07984 L
+.12727 .07984 L
+.13091 .07985 L
+.13428 .07985 L
+.13753 .07985 L
+.14096 .07985 L
+.14389 .07985 L
+.14709 .07985 L
+.15055 .07985 L
+.15425 .07985 L
+.15774 .07985 L
+.16091 .07985 L
+.16412 .07985 L
+.16708 .07985 L
+.17033 .07985 L
+.17377 .07985 L
+.17675 .07985 L
+.17955 .07985 L
+.18261 .07985 L
+.18591 .07985 L
+.18939 .07985 L
+Mistroke
+.1931 .07985 L
+.1966 .07985 L
+.19976 .07985 L
+.2035 .07985 L
+.20561 .07985 L
+.20755 .07985 L
+.21111 .07985 L
+.21487 .07985 L
+.21815 .07985 L
+.22166 .07985 L
+.22497 .07985 L
+.22798 .07985 L
+.23152 .07985 L
+.23339 .07985 L
+.23537 .07985 L
+.239 .07985 L
+.24236 .07985 L
+.24563 .07985 L
+.24907 .07985 L
+.252 .07985 L
+.25521 .07985 L
+.25868 .07985 L
+.26238 .07985 L
+.26588 .07985 L
+.26904 .07985 L
+.27226 .07985 L
+.27523 .07985 L
+.27848 .07985 L
+.28192 .07985 L
+.28491 .07985 L
+.28771 .07985 L
+.29077 .07985 L
+.29406 .07985 L
+.29756 .07985 L
+.30128 .07985 L
+.30445 .07985 L
+.30795 .07985 L
+.30991 .07985 L
+.31171 .07985 L
+.31575 .07985 L
+.31932 .07985 L
+.32111 .07985 L
+.32308 .07985 L
+.32493 .07985 L
+.32668 .07985 L
+.32996 .07985 L
+.33168 .07985 L
+.33349 .07985 L
+.33549 .07985 L
+.33732 .07985 L
+Mistroke
+.33889 .07985 L
+.34058 .07985 L
+.34364 .07985 L
+.34728 .07985 L
+.34887 .07985 L
+.35059 .07985 L
+.35238 .07985 L
+.35406 .07985 L
+.35776 .07985 L
+.36094 .07985 L
+.36274 .07985 L
+.36442 .07985 L
+.36539 .07985 L
+.36627 .07985 L
+.36825 .07985 L
+.37018 .07985 L
+.37228 .07985 L
+.37421 .07985 L
+.376 .07985 L
+.3777 .07985 L
+.37951 .07985 L
+.39258 .07985 L
+.39432 .07985 L
+.3952 .07985 L
+.39616 .07985 L
+.3972 .07985 L
+.39817 .07985 L
+.40002 .07985 L
+.407 .07985 L
+.41036 .07985 L
+.41391 .07985 L
+.41577 .07985 L
+.41675 .07985 L
+.41781 .07985 L
+.41878 .07985 L
+.41967 .07985 L
+.4214 .07985 L
+.42314 .07985 L
+.42474 .07985 L
+.4265 .07985 L
+.42749 .07985 L
+.42838 .07985 L
+.43183 .07985 L
+.43334 .07985 L
+.435 .07985 L
+.43806 .07985 L
+.43974 .07985 L
+.4413 .07985 L
+.44302 .07985 L
+.44458 .07985 L
+Mistroke
+.44641 .07985 L
+.4481 .07985 L
+.44955 .07985 L
+.45114 .07985 L
+.45274 .07985 L
+.45444 .07985 L
+.45754 .07985 L
+.45905 .07985 L
+.46042 .07985 L
+.46207 .07985 L
+.46382 .07985 L
+.46474 .07985 L
+.46573 .07985 L
+.46753 .07985 L
+.46924 .07985 L
+.47104 .07985 L
+.47428 .07985 L
+.4774 .07985 L
+.4789 .07985 L
+.48032 .07985 L
+.482 .07985 L
+.48352 .07985 L
+.48529 .07985 L
+.48696 .07985 L
+.48859 .07985 L
+.4904 .07985 L
+.49406 .07985 L
+.50063 .07985 L
+.50412 .07985 L
+.50779 .07985 L
+.50971 .07985 L
+.51182 .07985 L
+.51374 .07985 L
+.51551 .07985 L
+.51719 .07985 L
+.51897 .07985 L
+.52076 .07985 L
+.52273 .07985 L
+.52443 .07985 L
+.52625 .07985 L
+.52955 .07985 L
+.53622 .07985 L
+.54232 .07985 L
+.55718 .07985 L
+.57097 .07985 L
+.59697 .07985 L
+.61158 .07985 L
+.62533 .07985 L
+.65344 .07985 L
+.6789 .07985 L
+Mistroke
+.73168 .07985 L
+.78781 .07985 L
+.84187 .07985 L
+.89386 .07985 L
+.9492 .07985 L
+Mfstroke
+.9492 .07985 m
+1 .07985 L
s
MathSubEnd
P
@@ -1831,10 +2156,10 @@
% End of sub-graphic
0 g
gsave
-.38988 .53968 -61 -10.4375 Mabsadd m
+.38988 .53968 -61 -10.25 Mabsadd m
1 1 Mabs scale
currentpoint translate
-0 20.875 translate 1 -1 scale
+0 20.5 translate 1 -1 scale
/g { setgray} bind def
/k { setcmykcolor} bind def
/p { gsave} bind def
@@ -1855,21 +2180,21 @@
/My {currentpoint pop exch moveto} bind def
/X {0 rmoveto} bind def
/Y {0 exch rmoveto} bind def
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
0.000 0.000 rmoveto
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
(S2) show
-75.000 13.000 moveto
+75.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
@@ -1912,10 +2237,10 @@
% End of sub-graphic
0 g
gsave
-.38988 1.46032 -61 -10.4375 Mabsadd m
+.38988 1.46032 -61 -10.25 Mabsadd m
1 1 Mabs scale
currentpoint translate
-0 20.875 translate 1 -1 scale
+0 20.5 translate 1 -1 scale
/g { setgray} bind def
/k { setcmykcolor} bind def
/p { gsave} bind def
@@ -1936,21 +2261,21 @@
/My {currentpoint pop exch moveto} bind def
/X {0 rmoveto} bind def
/Y {0 exch rmoveto} bind def
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
0.000 0.000 rmoveto
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
(S1) show
-75.000 13.000 moveto
+75.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
Modified: trunk/test-suite/cases/semantic/00004/00004-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00004/00004-results.csv
===================================================================
--- trunk/test-suite/cases/semantic/00004/00004-results.csv 2009-03-18 00:05:24 UTC (rev 9413)
+++ trunk/test-suite/cases/semantic/00004/00004-results.csv 2009-03-18 00:16:23 UTC (rev 9414)
@@ -1,52 +1,52 @@
time,case00004`S1,case00004`S2
-0,1.5e-15,-2.403507126009926e-41
-0.2,1.398590729637801e-15,2.028185407243975e-16
-0.4,1.304037353090719e-15,3.919252938185608e-16
-0.6,1.215876367690821e-15,5.682472646183564e-16
-0.8,1.133675611156404e-15,7.326487776871892e-16
-1.,1.05703213457699e-15,8.859357308460174e-16
-1.2,9.855702281753476e-16,1.028859543649302e-15
-1.4,9.189395803685139e-16,1.16212083926297e-15
-1.6,8.568135916236433e-16,1.286372816752712e-15
-1.8,7.988876944188851e-16,1.402224611162228e-15
-2.,7.448779493377657e-16,1.510244101324467e-15
-2.2,6.945195988194609e-16,1.610960802361076e-15
-2.4,6.475657474215065e-16,1.704868505156985e-15
-2.6,6.03786300552749e-16,1.7924273988945e-15
-2.8,5.629666149523003e-16,1.874066770095397e-15
-3.,5.249065924557215e-16,1.950186815088554e-15
-3.2,4.894196627718156e-16,2.021160674456366e-15
-3.4,4.563318689149006e-16,2.087336262170196e-15
-3.6,4.254810144673833e-16,2.149037971065231e-15
-3.8,3.96715868492544e-16,2.20656826301491e-15
-4.,3.698954242002542e-16,2.260209151599489e-15
-4.2,3.448882077314679e-16,2.310223584537062e-15
-4.4,3.215716132202427e-16,2.356856773559512e-15
-4.6,2.998313933941232e-16,2.400337213211751e-15
-4.8,2.795609533493472e-16,2.440878093301303e-15
-5.,2.606609150282471e-16,2.478678169943503e-15
-5.2,2.430386197426663e-16,2.513922760514665e-15
-5.4,2.266076943699092e-16,2.546784611260179e-15
-5.6,2.112876062561434e-16,2.577424787487711e-15
-5.8,1.970032596124392e-16,2.605993480775119e-15
-6.,1.836846299445468e-16,2.632630740110904e-15
-6.2,1.712664228450826e-16,2.657467154309832e-15
-6.4,1.596877556875551e-16,2.680624488624887e-15
-6.6,1.488918692661636e-16,2.70221626146767e-15
-6.8,1.388258517068799e-16,2.722348296586238e-15
-7.,1.294403640468116e-16,2.741119271906375e-15
-7.2,1.206893987319694e-16,2.758621202536059e-15
-7.4,1.125300555526252e-16,2.774939888894747e-15
-7.6,1.049223325085724e-16,2.790155334982853e-15
-7.8,9.782893204043285e-17,2.804342135919132e-15
-8.,9.121508654302803e-17,2.817569826913942e-15
-8.2,8.504837982004744e-17,2.829903240359903e-15
-8.4,7.929858411602384e-17,2.84140283176795e-15
-8.6,7.393751296174339e-17,2.852124974076511e-15
-8.8,6.893888383599305e-17,2.862122232328011e-15
-9.,6.427819002358719e-17,2.871443619952823e-15
-9.2,5.993258429315959e-17,2.880134831413678e-15
-9.4,5.588076832800063e-17,2.888238463343996e-15
-9.6,5.21028820881317e-17,2.895794235823734e-15
-9.8,4.858041046280909e-17,2.90283917907438e-15
-10.,4.529607513728578e-17,2.909407849725426e-15
\ No newline at end of file
+0,0.15,0
+0.2,0.1429760887550795,0.01404782248984108
+0.4,0.1418174101699119,0.01636517966017622
+0.6,0.1417105224008525,0.01657895519829501
+0.8,0.1417013304160731,0.01659733916785408
+1.,0.141700544848195,0.01659891030361024
+1.2,0.1417004777475279,0.0165990445049445
+1.4,0.1417004720162983,0.01659905596740376
+1.6,0.14170047152678,0.0165990569464404
+1.8,0.141700471484969,0.01659905703006241
+2.,0.1417004714814062,0.01659905703718799
+2.2,0.1417004714810928,0.01659905703781462
+2.4,0.1417004714810663,0.01659905703786755
+2.6,0.1417004714810641,0.01659905703787191
+2.8,0.1417004714810644,0.01659905703787145
+3.,0.1417004714810646,0.01659905703787109
+3.2,0.1417004714810644,0.01659905703787141
+3.4,0.1417004714810644,0.01659905703787141
+3.6,0.1417004714810643,0.01659905703787156
+3.8,0.1417004714810643,0.01659905703787157
+4.,0.1417004714810643,0.01659905703787159
+4.2,0.1417004714810643,0.01659905703787159
+4.4,0.1417004714810643,0.01659905703787158
+4.6,0.1417004714810643,0.01659905703787157
+4.8,0.1417004714810643,0.01659905703787157
+5.,0.1417004714810643,0.01659905703787158
+5.2,0.1417004714810643,0.01659905703787158
+5.4,0.1417004714810643,0.01659905703787158
+5.6,0.1417004714810643,0.01659905703787158
+5.8,0.1417004714810643,0.01659905703787158
+6.,0.1417004714810643,0.01659905703787158
+6.2,0.1417004714810643,0.01659905703787158
+6.4,0.1417004714810643,0.01659905703787157
+6.6,0.1417004714810643,0.01659905703787157
+6.8,0.1417004714810643,0.01659905703787157
+7.,0.1417004714810643,0.01659905703787157
+7.2,0.1417004714810643,0.01659905703787157
+7.4,0.1417004714810643,0.01659905703787158
+7.6,0.1417004714810643,0.01659905703787158
+7.8,0.1417004714810643,0.01659905703787158
+8.,0.1417004714810643,0.01659905703787158
+8.2,0.1417004714810643,0.01659905703787158
+8.4,0.1417004714810643,0.01659905703787157
+8.6,0.1417004714810643,0.01659905703787157
+8.8,0.1417004714810643,0.01659905703787157
+9.,0.1417004714810643,0.01659905703787157
+9.2,0.1417004714810643,0.01659905703787157
+9.4,0.1417004714810643,0.01659905703787157
+9.6,0.1417004714810643,0.01659905703787157
+9.8,0.1417004714810643,0.01659905703787157
+10.,0.1417004714810643,0.01659905703787157
\ No newline at end of file
Modified: trunk/test-suite/cases/semantic/00004/00004-sbml-l1v2.xml
===================================================================
--- trunk/test-suite/cases/semantic/00004/00004-sbml-l1v2.xml 2009-03-18 00:05:24 UTC (rev 9413)
+++ trunk/test-suite/cases/semantic/00004/00004-sbml-l1v2.xml 2009-03-18 00:16:23 UTC (rev 9414)
@@ -5,7 +5,7 @@
<compartment name="compartment" volume="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species name="S1" compartment="compartment" initialAmount="1.5e-015" units="substance"/>
+ <species name="S1" compartment="compartment" initialAmount="0.15" units="substance"/>
<species name="S2" compartment="compartment" initialAmount="0" units="substance"/>
</listOfSpecies>
<listOfParameters>
Modified: trunk/test-suite/cases/semantic/00004/00004-sbml-l2v1.xml
===================================================================
--- trunk/test-suite/cases/semantic/00004/00004-sbml-l2v1.xml 2009-03-18 00:05:24 UTC (rev 9413)
+++ trunk/test-suite/cases/semantic/00004/00004-sbml-l2v1.xml 2009-03-18 00:16:23 UTC (rev 9414)
@@ -5,7 +5,7 @@
<compartment id="compartment" name="compartment" size="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1.5e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.15" substanceUnits="substance"/>
<species id="S2" name="S2" compartment="compartment" initialAmount="0" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
Modified: trunk/test-suite/cases/semantic/00004/00004-sbml-l2v2.xml
===================================================================
--- trunk/test-suite/cases/semantic/00004/00004-sbml-l2v2.xml 2009-03-18 00:05:24 UTC (rev 9413)
+++ trunk/test-suite/cases/semantic/00004/00004-sbml-l2v2.xml 2009-03-18 00:16:23 UTC (rev 9414)
@@ -5,7 +5,7 @@
<compartment id="compartment" name="compartment" size="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1.5e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.15" substanceUnits="substance"/>
<species id="S2" name="S2" compartment="compartment" initialAmount="0" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
Modified: trunk/test-suite/cases/semantic/00004/00004-sbml-l2v3.xml
===================================================================
--- trunk/test-suite/cases/semantic/00004/00004-sbml-l2v3.xml 2009-03-18 00:05:24 UTC (rev 9413)
+++ trunk/test-suite/cases/semantic/00004/00004-sbml-l2v3.xml 2009-03-18 00:16:23 UTC (rev 9414)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated 5-February-2008 11:12:14.4687500 -->
-<!-- Generated by MathSBML 2.7.1 (7 December 2007) -->
+<!-- Generated 17-March-2009 17:12:13.0468750 -->
+<!-- Generated by MathSBML 2.7.5 [2-May-2008] -->
<!-- Generated using Mathematica Version 5.2 for Microsoft Windows (June 20, 2005) -->
<sbml xmlns="http://www.sbml.org/sbml/level2/version3"
level="2"
@@ -17,7 +17,7 @@
name="compartment"
spatialDimensions="3"
units="volume"
- size="1"/>
+ size="1."/>
</listOfCompartments>
<listOfSpecies>
<species id="S1"
@@ -25,7 +25,7 @@
compartment="compartment"
boundaryCondition="false"
constant="false"
- initialAmount="1.5000000000000001e-15"
+ initialAmount="0.15000000000000002"
substanceUnits="substance"
hasOnlySubstanceUnits="false"/>
<species id="S2"
@@ -43,7 +43,7 @@
value="0.35"/>
<parameter id="k2"
name="k2"
- value="180"/>
+ value="180."/>
</listOfParameters>
<!-- <listOfInitialAssignments/> -->
<!-- <listOfRules/> -->
Modified: trunk/test-suite/cases/semantic/00004/00004-sbml-l2v4.xml
===================================================================
--- trunk/test-suite/cases/semantic/00004/00004-sbml-l2v4.xml 2009-03-18 00:05:24 UTC (rev 9413)
+++ trunk/test-suite/cases/semantic/00004/00004-sbml-l2v4.xml 2009-03-18 00:16:23 UTC (rev 9414)
@@ -5,7 +5,7 @@
<compartment id="compartment" name="compartment" size="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1.5e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.15" substanceUnits="substance"/>
<species id="S2" name="S2" compartment="compartment" initialAmount="0" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
Modified: trunk/test-suite/cases/semantic/00004/00004-settings.txt
===================================================================
--- trunk/test-suite/cases/semantic/00004/00004-settings.txt 2009-03-18 00:05:24 UTC (rev 9413)
+++ trunk/test-suite/cases/semantic/00004/00004-settings.txt 2009-03-18 00:16:23 UTC (rev 9414)
@@ -2,7 +2,7 @@
duration: 10.0
steps: 50
variables: S1, S2
-absolute: 1e-19
+absolute: 1.000000e-004
relative: 0.0001
amount: S1, S2
concentration:
Modified: trunk/test-suite/cases/semantic/00005/00005-model.m
===================================================================
--- trunk/test-suite/cases/semantic/00005/00005-model.m 2009-03-18 00:05:24 UTC (rev 9413)
+++ trunk/test-suite/cases/semantic/00005/00005-model.m 2009-03-18 00:16:23 UTC (rev 9414)
@@ -19,8 +19,8 @@
The initial conditions are as follows:
[{width:30em,margin-left:5em}| |*Value* |*Units* |
-|Initial amount of S1 |$1.5 \x 10^-15$ |mole |
-|Initial amount of S2 |$1.5 \x 10^-15$ |mole |
+|Initial amount of S1 |$1.5 \x 10^-4$ |mole |
+|Initial amount of S2 |$1.5 \x 10^-4$ |mole |
|Value of parameter k1 |$1$ |second^-1^ |
|Volume of compartment "compartment" |$1$ |litre |]
@@ -37,8 +37,8 @@
newcase[ "00005" ];
addCompartment[ compartment, size -> 1 ];
-addSpecies[ S1, initialAmount -> 1.5 10^-15 ];
-addSpecies[ S2, initialAmount -> 1.5 10^-15 ];
+addSpecies[ S1, initialAmount -> 1.5 10^-4 ];
+addSpecies[ S2, initialAmount -> 1.5 10^-4 ];
addParameter[ k1, value -> 1 ];
addReaction[ S1 -> S2, reversible -> False,
kineticLaw -> k1 * S1 * compartment ];
Modified: trunk/test-suite/cases/semantic/00005/00005-results.csv
===================================================================
--- trunk/test-suite/cases/semantic/00005/00005-results.csv 2009-03-18 00:05:24 UTC (rev 9413)
+++ trunk/test-suite/cases/semantic/00005/00005-results.csv 2009-03-18 00:16:23 UTC (rev 9414)
@@ -1,52 +1,52 @@
-time,case00005`S1,case00005`S2
-0,1.5e-015,1.5e-015
-0.1,1.35726e-015,1.64274e-015
-0.2,1.2281e-015,1.7719e-015
-0.3,1.11123e-015,1.88877e-015
-0.4,1.00548e-015,1.99452e-015
-0.5,9.09796e-016,2.0902e-015
-0.6,8.23217e-016,2.17678e-015
-0.7,7.44878e-016,2.25512e-015
-0.8,6.73993e-016,2.32601e-015
-0.9,6.09854e-016,2.39015e-015
-1,5.51819e-016,2.44818e-015
-1.1,4.99307e-016,2.50069e-015
-1.2,4.51791e-016,2.54821e-015
-1.3,4.08798e-016,2.5912e-015
-1.4,3.69895e-016,2.6301e-015
-1.5,3.34695e-016,2.6653e-015
-1.6,3.02845e-016,2.69716e-015
-1.7,2.74025e-016,2.72597e-015
-1.8,2.47948e-016,2.75205e-015
-1.9,2.24353e-016,2.77565e-015
-2,2.03003e-016,2.797e-015
-2.1,1.83685e-016,2.81632e-015
-2.2,1.66205e-016,2.8338e-015
-2.3,1.50388e-016,2.84961e-015
-2.4,1.36077e-016,2.86392e-015
-2.5,1.23127e-016,2.87687e-015
-2.6,1.1141e-016,2.88859e-015
-2.7,1.00808e-016,2.89919e-015
-2.8,9.12151e-017,2.90878e-015
-2.9,8.25348e-017,2.91747e-015
-3,7.46806e-017,2.92532e-015
-3.1,6.75738e-017,2.93243e-015
-3.2,6.11433e-017,2.93886e-015
-3.3,5.53248e-017,2.94468e-015
-3.4,5.00599e-017,2.94994e-015
-3.5,4.52961e-017,2.9547e-015
-3.6,4.09856e-017,2.95901e-015
-3.7,3.70853e-017,2.96291e-015
-3.8,3.35562e-017,2.96644e-015
-3.9,3.03629e-017,2.96964e-015
-4,2.74735e-017,2.97253e-015
-4.1,2.4859e-017,2.97514e-015
-4.2,2.24934e-017,2.97751e-015
-4.3,2.03528e-017,2.97965e-015
-4.4,1.8416e-017,2.98158e-015
-4.5,1.66635e-017,2.98334e-015
-4.6,1.50778e-017,2.98492e-015
-4.7,1.36429e-017,2.98636e-015
-4.8,1.23446e-017,2.98766e-015
-4.9,1.11699e-017,2.98883e-015
-5,1.01069e-017,2.98989e-015
\ No newline at end of file
+time,S1,S2
+0,0.00015,0.00015
+0.1,0.0001357256127053939,0.0001642743872946061
+0.2,0.0001228096129616973,0.0001771903870383027
+0.3,0.0001111227331022577,0.0001888772668977423
+0.4,0.0001005480069053459,0.0001994519930946541
+0.5,9.097959895689501e-005,0.000209020401043105
+0.6,8.232174541410396e-005,0.0002176782545858961
+0.7,7.448779556871142e-005,0.0002255122044312886
+0.8,6.739934461758323e-005,0.0002326006553824168
+0.9,6.098544896108986e-005,0.0002390145510389101
+1,5.518191617571635e-005,0.0002448180838242837
+1.1,4.993066255471193e-005,0.0002500693374452881
+1.2,4.517913178683031e-005,0.0002548208682131697
+1.3,4.087976895510189e-005,0.0002591202310448981
+1.4,3.698954459124097e-005,0.000263010455408759
+1.5,3.346952402226447e-005,0.0002665304759777355
+1.6,3.028447769919831e-005,0.0002697155223008017
+1.7,2.740252860791019e-005,0.0002725974713920898
+1.8,2.479483323323798e-005,0.000275205166766762
+1.9,2.243529288339526e-005,0.0002775647071166048
+2,2.03002924854919e-005,0.0002796997075145081
+2.1,1.836846423794729e-005,0.0002816315357620527
+2.2,1.662047375435008e-005,0.0002833795262456499
+2.3,1.503882655842056e-005,0.0002849611734415794
+2.4,1.360769299341187e-005,0.0002863923070065881
+2.5,1.231274979358482e-005,0.0002876872502064152
+2.6,1.114103673215008e-005,0.0002888589632678499
+2.7,1.008082691096246e-005,0.0002899191730890375
+2.8,9.121509393782692e-006,0.0002908784906062173
+2.9,8.253483008461082e-006,0.0002917465169915389
+3,7.468060255179591e-006,0.0002925319397448204
+3.1,6.757380359033671e-006,0.0002932426196409663
+3.2,6.114330596754931e-006,0.000293885669403245
+3.3,5.532475110186e-006,0.000294467524889814
+3.4,5.00599049404891e-006,0.0002949940095059511
+3.5,4.529607513347775e-006,0.0002954703924866522
+3.6,4.098558367093884e-006,0.0002959014416329061
+3.7,3.708528970550908e-006,0.0002962914710294491
+3.8,3.355615778424839e-006,0.0002966443842215752
+3.9,3.036286716870657e-006,0.0002969637132831294
+4,2.747345833310127e-006,0.0002972526541666899
+4.1,2.485901310264186e-006,0.0002975140986897358
+4.2,2.249336523071655e-006,0.0002977506634769284
+4.3,2.03528385183014e-006,0.0002979647161481699
+4.4,1.841600985460266e-006,0.0002981583990145398
+4.5,1.666349480736346e-006,0.0002983336505192636
+4.6,1.507775361695036e-006,0.000298492224638305
+4.7,1.364291565254372e-006,0.0002986357084347456
+4.8,1.234462057353003e-006,0.000298765537942647
+4.9,1.116987460638651e-006,0.0002988830125393614
+5,1.01069204986282e-006,0.0002989893079501372
Modified: trunk/test-suite/cases/semantic/00005/00005-sbml-l1v2.xml
===================================================================
--- trunk/test-suite/cases/semantic/00005/00005-sbml-l1v2.xml 2009-03-18 00:05:24 UTC (rev 9413)
+++ trunk/test-suite/cases/semantic/00005/00005-sbml-l1v2.xml 2009-03-18 00:16:23 UTC (rev 9414)
@@ -5,8 +5,8 @@
<compartment name="compartment" volume="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species name="S1" compartment="compartment" initialAmount="1.5e-015" units="substance"/>
- <species name="S2" compartment="compartment" initialAmount="1.5e-015" units="substance"/>
+ <species name="S1" compartment="compartment" initialAmount="0.00015" units="substance"/>
+ <species name="S2" compartment="compartment" initialAmount="0.00015" units="substance"/>
</listOfSpecies>
<listOfParameters>
<parameter name="k1" value="1"/>
Modified: trunk/test-suite/cases/semantic/00005/00005-sbml-l2v1.xml
===================================================================
--- trunk/test-suite/cases/semantic/00005/00005-sbml-l2v1.xml 2009-03-18 00:05:24 UTC (rev 9413)
+++ trunk/test-suite/cases/semantic/00005/00005-sbml-l2v1.xml 2009-03-18 00:16:23 UTC (rev 9414)
@@ -5,8 +5,8 @@
<compartment id="compartment" name="compartment" size="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1.5e-015" substanceUnits="substance"/>
- <species id="S2" name="S2" compartment="compartment" initialAmount="1.5e-015" substanceUnits="subs...
[truncated message content] |
|
From: <sar...@us...> - 2009-03-18 00:05:28
|
Revision: 9413
http://sbml.svn.sourceforge.net/sbml/?rev=9413&view=rev
Author: sarahkeating
Date: 2009-03-18 00:05:24 +0000 (Wed, 18 Mar 2009)
Log Message:
-----------
changes values used so that tolerance does not exceed machine double precision
Modified Paths:
--------------
trunk/test-suite/cases/semantic/00045/00045-model.m
trunk/test-suite/cases/semantic/00045/00045-results.csv
trunk/test-suite/cases/semantic/00045/00045-sbml-l2v1.xml
trunk/test-suite/cases/semantic/00045/00045-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00045/00045-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00045/00045-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00045/00045-settings.txt
trunk/test-suite/cases/semantic/00046/00046-model.m
trunk/test-suite/cases/semantic/00046/00046-plot.eps
trunk/test-suite/cases/semantic/00046/00046-plot.jpg
trunk/test-suite/cases/semantic/00046/00046-results.csv
trunk/test-suite/cases/semantic/00046/00046-sbml-l2v1.xml
trunk/test-suite/cases/semantic/00046/00046-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00046/00046-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00046/00046-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00046/00046-settings.txt
trunk/test-suite/cases/semantic/00047/00047-model.m
trunk/test-suite/cases/semantic/00047/00047-plot.eps
trunk/test-suite/cases/semantic/00047/00047-plot.jpg
trunk/test-suite/cases/semantic/00047/00047-results.csv
trunk/test-suite/cases/semantic/00047/00047-sbml-l2v1.xml
trunk/test-suite/cases/semantic/00047/00047-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00047/00047-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00047/00047-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00047/00047-settings.txt
trunk/test-suite/cases/semantic/00048/00048-model.m
trunk/test-suite/cases/semantic/00048/00048-results.csv
trunk/test-suite/cases/semantic/00048/00048-sbml-l2v1.xml
trunk/test-suite/cases/semantic/00048/00048-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00048/00048-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00048/00048-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00048/00048-settings.txt
trunk/test-suite/cases/semantic/00049/00049-model.m
trunk/test-suite/cases/semantic/00049/00049-plot.eps
trunk/test-suite/cases/semantic/00049/00049-plot.jpg
trunk/test-suite/cases/semantic/00049/00049-results.csv
trunk/test-suite/cases/semantic/00049/00049-sbml-l2v1.xml
trunk/test-suite/cases/semantic/00049/00049-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00049/00049-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00049/00049-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00049/00049-settings.txt
trunk/test-suite/cases/semantic/00050/00050-model.m
trunk/test-suite/cases/semantic/00050/00050-plot.eps
trunk/test-suite/cases/semantic/00050/00050-plot.jpg
trunk/test-suite/cases/semantic/00050/00050-results.csv
trunk/test-suite/cases/semantic/00050/00050-sbml-l2v1.xml
trunk/test-suite/cases/semantic/00050/00050-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00050/00050-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00050/00050-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00050/00050-settings.txt
Modified: trunk/test-suite/cases/semantic/00045/00045-model.m
===================================================================
--- trunk/test-suite/cases/semantic/00045/00045-model.m 2009-03-17 23:47:48 UTC (rev 9412)
+++ trunk/test-suite/cases/semantic/00045/00045-model.m 2009-03-18 00:05:24 UTC (rev 9413)
@@ -19,7 +19,7 @@
The initial conditions are as follows:
[{width:30em,margin-left:5em}| |*Value* |*Units* |
-|Initial amount of S1 |$1.5 \x 10^-15$ |mole |
+|Initial amount of S1 |$1.5 \x 10^-1$ |mole |
|Initial amount of S2 |$ 0$ |mole |
|Value of parameter k1 |$ 1$ |second^-1^ |
|Length of compartment "compartment" |$ 1$ |metre |]
@@ -37,7 +37,7 @@
newcase[ "00045" ];
addCompartment[ compartment, spatialDimensions-> 1, size -> 1 ];
-addSpecies[ S1, initialAmount -> 1.5 10^-15 ];
+addSpecies[ S1, initialAmount -> 1.5 10^-1 ];
addSpecies[ S2, initialAmount -> 0 ];
addParameter[ k1, value -> 1 ];
addReaction[ S1 -> S2, reversible -> False,
Modified: trunk/test-suite/cases/semantic/00045/00045-results.csv
===================================================================
--- trunk/test-suite/cases/semantic/00045/00045-results.csv 2009-03-17 23:47:48 UTC (rev 9412)
+++ trunk/test-suite/cases/semantic/00045/00045-results.csv 2009-03-18 00:05:24 UTC (rev 9413)
@@ -1,52 +1,52 @@
-time,case00045`S1,case00045`S2
-0,1.5e-015,0
-0.1,1.35726e-015,1.42744e-016
-0.2,1.2281e-015,2.71904e-016
-0.3,1.11123e-015,3.88773e-016
-0.4,1.00548e-015,4.9452e-016
-0.5,9.09796e-016,5.90204e-016
-0.6,8.23217e-016,6.76783e-016
-0.7,7.44878e-016,7.55122e-016
-0.8,6.73993e-016,8.26007e-016
-0.9,6.09854e-016,8.90146e-016
-1,5.51819e-016,9.48181e-016
-1.1,4.99307e-016,1.00069e-015
-1.2,4.51791e-016,1.04821e-015
-1.3,4.08798e-016,1.0912e-015
-1.4,3.69895e-016,1.1301e-015
-1.5,3.34695e-016,1.1653e-015
-1.6,3.02845e-016,1.19716e-015
-1.7,2.74025e-016,1.22597e-015
-1.8,2.47948e-016,1.25205e-015
-1.9,2.24353e-016,1.27565e-015
-2,2.03003e-016,1.297e-015
-2.1,1.83685e-016,1.31632e-015
-2.2,1.66205e-016,1.3338e-015
-2.3,1.50388e-016,1.34961e-015
-2.4,1.36077e-016,1.36392e-015
-2.5,1.23127e-016,1.37687e-015
-2.6,1.1141e-016,1.38859e-015
-2.7,1.00808e-016,1.39919e-015
-2.8,9.12151e-017,1.40878e-015
-2.9,8.25348e-017,1.41747e-015
-3,7.46806e-017,1.42532e-015
-3.1,6.75738e-017,1.43243e-015
-3.2,6.11433e-017,1.43886e-015
-3.3,5.53248e-017,1.44468e-015
-3.4,5.00599e-017,1.44994e-015
-3.5,4.52961e-017,1.4547e-015
-3.6,4.09856e-017,1.45901e-015
-3.7,3.70853e-017,1.46291e-015
-3.8,3.35562e-017,1.46644e-015
-3.9,3.03629e-017,1.46964e-015
-4,2.74735e-017,1.47253e-015
-4.1,2.4859e-017,1.47514e-015
-4.2,2.24934e-017,1.47751e-015
-4.3,2.03528e-017,1.47965e-015
-4.4,1.8416e-017,1.48158e-015
-4.5,1.66635e-017,1.48334e-015
-4.6,1.50778e-017,1.48492e-015
-4.7,1.36429e-017,1.48636e-015
-4.8,1.23446e-017,1.48766e-015
-4.9,1.11699e-017,1.48883e-015
-5,1.01069e-017,1.48989e-015
\ No newline at end of file
+time,S1,S2
+0,0.15,0
+0.1,0.1357256127053939,0.01427438729460607
+0.2,0.1228096129616973,0.02719038703830272
+0.3,0.1111227331022577,0.03887726689774233
+0.4,0.1005480069053459,0.04945199309465411
+0.5,0.09097959895689502,0.05902040104310499
+0.6,0.08232174541410396,0.06767825458589605
+0.7,0.07448779556871142,0.07551220443128857
+0.8,0.06739934461758323,0.08260065538241676
+0.9,0.06098544896108987,0.08901455103891014
+1,0.05518191617571635,0.09481808382428365
+1.1,0.04993066255471193,0.1000693374452881
+1.2,0.04517913178683031,0.1048208682131697
+1.3,0.04087976895510189,0.1091202310448981
+1.4,0.03698954459124097,0.113010455408759
+1.5,0.03346952402226448,0.1165304759777355
+1.6,0.03028447769919831,0.1197155223008017
+1.7,0.02740252860791019,0.1225974713920898
+1.8,0.02479483323323798,0.125205166766762
+1.9,0.02243529288339526,0.1275647071166048
+2,0.02030029248549191,0.1296997075145081
+2.1,0.01836846423794728,0.1316315357620527
+2.2,0.01662047375435008,0.1333795262456499
+2.3,0.01503882655842056,0.1349611734415795
+2.4,0.01360769299341187,0.1363923070065881
+2.5,0.01231274979358482,0.1376872502064152
+2.6,0.01114103673215008,0.1388589632678499
+2.7,0.01008082691096246,0.1399191730890375
+2.8,0.009121509393782692,0.1408784906062173
+2.9,0.008253483008461082,0.1417465169915389
+3,0.007468060255179591,0.1425319397448204
+3.1,0.00675738035903367,0.1432426196409663
+3.2,0.006114330596754931,0.1438856694032451
+3.3,0.005532475110186,0.144467524889814
+3.4,0.00500599049404891,0.1449940095059511
+3.5,0.004529607513347776,0.1454703924866522
+3.6,0.004098558367093884,0.1459014416329061
+3.7,0.003708528970550908,0.1462914710294491
+3.8,0.003355615778424839,0.1466443842215752
+3.9,0.003036286716870657,0.1469637132831294
+4,0.002747345833310127,0.1472526541666899
+4.1,0.002485901310264186,0.1475140986897358
+4.2,0.002249336523071656,0.1477506634769283
+4.3,0.00203528385183014,0.1479647161481699
+4.4,0.001841600985460266,0.1481583990145397
+4.5,0.001666349480736346,0.1483336505192636
+4.6,0.001507775361695036,0.148492224638305
+4.7,0.001364291565254372,0.1486357084347456
+4.8,0.001234462057353003,0.148765537942647
+4.9,0.001116987460638651,0.1488830125393613
+5,0.00101069204986282,0.1489893079501372
Modified: trunk/test-suite/cases/semantic/00045/00045-sbml-l2v1.xml
===================================================================
--- trunk/test-suite/cases/semantic/00045/00045-sbml-l2v1.xml 2009-03-17 23:47:48 UTC (rev 9412)
+++ trunk/test-suite/cases/semantic/00045/00045-sbml-l2v1.xml 2009-03-18 00:05:24 UTC (rev 9413)
@@ -5,7 +5,7 @@
<compartment id="compartment" name="compartment" spatialDimensions="1" size="1" units="length"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1.5e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.15" substanceUnits="substance"/>
<species id="S2" name="S2" compartment="compartment" initialAmount="0" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
Modified: trunk/test-suite/cases/semantic/00045/00045-sbml-l2v2.xml
===================================================================
--- trunk/test-suite/cases/semantic/00045/00045-sbml-l2v2.xml 2009-03-17 23:47:48 UTC (rev 9412)
+++ trunk/test-suite/cases/semantic/00045/00045-sbml-l2v2.xml 2009-03-18 00:05:24 UTC (rev 9413)
@@ -5,7 +5,7 @@
<compartment id="compartment" name="compartment" spatialDimensions="1" size="1" units="length"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1.5e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.15" substanceUnits="substance"/>
<species id="S2" name="S2" compartment="compartment" initialAmount="0" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
Modified: trunk/test-suite/cases/semantic/00045/00045-sbml-l2v3.xml
===================================================================
--- trunk/test-suite/cases/semantic/00045/00045-sbml-l2v3.xml 2009-03-17 23:47:48 UTC (rev 9412)
+++ trunk/test-suite/cases/semantic/00045/00045-sbml-l2v3.xml 2009-03-18 00:05:24 UTC (rev 9413)
@@ -25,7 +25,7 @@
compartment="compartment"
boundaryCondition="false"
constant="false"
- initialAmount="1.5000000000000001e-15"
+ initialAmount="1.5e-1"
substanceUnits="substance"
hasOnlySubstanceUnits="false"/>
<species id="S2"
Modified: trunk/test-suite/cases/semantic/00045/00045-sbml-l2v4.xml
===================================================================
--- trunk/test-suite/cases/semantic/00045/00045-sbml-l2v4.xml 2009-03-17 23:47:48 UTC (rev 9412)
+++ trunk/test-suite/cases/semantic/00045/00045-sbml-l2v4.xml 2009-03-18 00:05:24 UTC (rev 9413)
@@ -5,7 +5,7 @@
<compartment id="compartment" name="compartment" spatialDimensions="1" size="1" units="length"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1.5e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.15" substanceUnits="substance"/>
<species id="S2" name="S2" compartment="compartment" initialAmount="0" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
Modified: trunk/test-suite/cases/semantic/00045/00045-settings.txt
===================================================================
--- trunk/test-suite/cases/semantic/00045/00045-settings.txt 2009-03-17 23:47:48 UTC (rev 9412)
+++ trunk/test-suite/cases/semantic/00045/00045-settings.txt 2009-03-18 00:05:24 UTC (rev 9413)
@@ -2,7 +2,7 @@
duration: 5.0
steps: 50
variables: S1, S2
-absolute: 0.0000000000000000001
+absolute: 1.000000e-004
relative: 0.0001
amount: S1, S2
concentration:
Modified: trunk/test-suite/cases/semantic/00046/00046-model.m
===================================================================
--- trunk/test-suite/cases/semantic/00046/00046-model.m 2009-03-17 23:47:48 UTC (rev 9412)
+++ trunk/test-suite/cases/semantic/00046/00046-model.m 2009-03-18 00:05:24 UTC (rev 9413)
@@ -20,9 +20,9 @@
The initial conditions are as follows:
[{width:30em,margin-left:5em}| |*Value* |*Units* |
-|Initial amount of S1 |$1.0 \x 10^-15$ |mole |
-|Initial amount of S2 |$2.0 \x 10^-15$ |mole |
-|Initial amount of S3 |$1.0 \x 10^-15$ |mole |
+|Initial amount of S1 |$1.0 \x 10^-4$ |mole |
+|Initial amount of S2 |$2.0 \x 10^-4$ |mole |
+|Initial amount of S3 |$1.0 \x 10^-4$ |mole |
|Value of parameter k1 |$ 0.75$ |metre mole^-1^ second^-1^ |
|Value of parameter k2 |$ 0.25$ |second^-1^ |
|Length of compartment "compartment" |$ 1$ |metre |]
@@ -37,9 +37,9 @@
newcase[ "00046" ];
addCompartment[ compartment, spatialDimensions-> 1, size -> 1 ];
-addSpecies[ S1, initialAmount -> 1.0 10^-15];
-addSpecies[ S2, initialAmount -> 2.0 10^-15];
-addSpecies[ S3, initialAmount -> 1.0 10^-15];
+addSpecies[ S1, initialAmount -> 1.0 10^-4];
+addSpecies[ S2, initialAmount -> 2.0 10^-4];
+addSpecies[ S3, initialAmount -> 1.0 10^-4];
addParameter[ k1, value -> 0.75 ];
addParameter[ k2, value -> 0.25 ];
addReaction[ S1 + S2 -> S3, reversible -> False,
Modified: trunk/test-suite/cases/semantic/00046/00046-plot.eps
===================================================================
--- trunk/test-suite/cases/semantic/00046/00046-plot.eps 2009-03-17 23:47:48 UTC (rev 9412)
+++ trunk/test-suite/cases/semantic/00046/00046-plot.eps 2009-03-18 00:05:24 UTC (rev 9413)
@@ -2,16 +2,13 @@
%%BoundingBox: 88 4 376 144
%%HiResBoundingBox: 88 4 376 143.563
%%Creator: (Mathematica 5.2 for Microsoft Windows)
-%%CreationDate: (Thursday, February 7, 2008) (12:16:38)
+%%CreationDate: (Tuesday, March 17, 2009) (16:52:30)
%%Title: Clipboard
-%%DocumentNeededResources: font Math1Mono
-%%+ font Courier
+%%DocumentNeededResources: font Courier
%%DocumentSuppliedResources:
-%%DocumentNeededFonts: Math1Mono
-%%+ Courier
+%%DocumentNeededFonts: Courier
%%DocumentSuppliedFonts:
-%%DocumentFonts: Math1Mono
-%%+ Courier
+%%DocumentFonts: Courier
%%EndComments
0 147.563 translate 1 -1 scale
150 dict begin
@@ -1173,11 +1170,11 @@
/Y {0 exch rmoveto} bind def
gsave
newpath
- 143.313 112.563 moveto
- 277.500 112.563 lineto
- 277.500 29.625 lineto
- 143.313 29.625 lineto
- 143.313 112.563 lineto
+ 135.750 113.938 moveto
+ 277.313 113.938 lineto
+ 277.313 26.438 lineto
+ 135.750 26.438 lineto
+ 135.750 113.938 lineto
closepath
clip newpath
grestore
@@ -1410,7 +1407,7 @@
%%IncludeFont: Courier
/Courier findfont 10 scalefont setfont
% Scaling calculations
-0.0238095 0.047619 0.0147151 1.96643e+014 [
+0.0238095 0.047619 0.0147151 1967.57 [
[.2619 .00222 -3 -9 ]
[.2619 .00222 3 0 ]
[.5 .00222 -6 -9 ]
@@ -1419,20 +1416,20 @@
[.7381 .00222 6 0 ]
[.97619 .00222 -6 -9 ]
[.97619 .00222 6 0 ]
-[1.025 .01472 0 -6.4375 ]
-[1.025 .01472 28 6.4375 ]
-[.01131 .11304 -37.5 -6.25 ]
-[.01131 .11304 0 6.25 ]
-[.01131 .21136 -37.5 -6.25 ]
-[.01131 .21136 0 6.25 ]
-[.01131 .30968 -49.5 -6.25 ]
-[.01131 .30968 0 6.25 ]
-[.01131 .408 -37.5 -6.25 ]
-[.01131 .408 0 6.25 ]
-[.01131 .50632 -49.5 -6.25 ]
-[.01131 .50632 0 6.25 ]
-[.01131 .60464 -37.5 -6.25 ]
-[.01131 .60464 0 6.25 ]
+[1.025 .01472 0 -6.25 ]
+[1.025 .01472 28 6.25 ]
+[.01131 .11309 -42 -4.5 ]
+[.01131 .11309 0 4.5 ]
+[.01131 .21147 -36 -4.5 ]
+[.01131 .21147 0 4.5 ]
+[.01131 .30985 -42 -4.5 ]
+[.01131 .30985 0 4.5 ]
+[.01131 .40823 -36 -4.5 ]
+[.01131 .40823 0 4.5 ]
+[.01131 .50661 -42 -4.5 ]
+[.01131 .50661 0 4.5 ]
+[.01131 .60499 -36 -4.5 ]
+[.01131 .60499 0 4.5 ]
[ 0 0 0 0 ]
[ 1 .61803 0 0 ]
] MathScale
@@ -1513,10 +1510,10 @@
1 .01472 L
s
gsave
-1.025 .01472 -61 -10.4375 Mabsadd m
+1.025 .01472 -61 -10.25 Mabsadd m
1 1 Mabs scale
currentpoint translate
-0 20.875 translate 1 -1 scale
+0 20.5 translate 1 -1 scale
/g { setgray} bind def
/k { setcmykcolor} bind def
/p { gsave} bind def
@@ -1537,21 +1534,21 @@
/My {currentpoint pop exch moveto} bind def
/X {0 rmoveto} bind def
/Y {0 exch rmoveto} bind def
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
0.000 0.000 rmoveto
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
(Time) show
-87.000 13.000 moveto
+87.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
@@ -1560,174 +1557,102 @@
0.000 0.000 rmoveto
1.000 setlinewidth
grestore
-.02381 .11304 m
-.03006 .11304 L
+.02381 .11309 m
+.03006 .11309 L
s
-gsave
-.01131 .11304 -37.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(5) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-16) show
-grestore
-.02381 .21136 m
-.03006 .21136 L
+[(0.00005)] .01131 .11309 1 0 Mshowa
+.02381 .21147 m
+.03006 .21147 L
s
-gsave
-.01131 .21136 -37.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(1) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
-.02381 .30968 m
-.03006 .30968 L
+[(0.0001)] .01131 .21147 1 0 Mshowa
+.02381 .30985 m
+.03006 .30985 L
s
-gsave
-.01131 .30968 -49.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(1.5) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
-.02381 .408 m
-.03006 .408 L
+[(0.00015)] .01131 .30985 1 0 Mshowa
+.02381 .40823 m
+.03006 .40823 L
s
-gsave
-.01131 .408 -37.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(2) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
-.02381 .50632 m
-.03006 .50632 L
+[(0.0002)] .01131 .40823 1 0 Mshowa
+.02381 .50661 m
+.03006 .50661 L
s
-gsave
-.01131 .50632 -49.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(2.5) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
-.02381 .60464 m
-.03006 .60464 L
+[(0.00025)] .01131 .50661 1 0 Mshowa
+.02381 .60499 m
+.03006 .60499 L
s
-gsave
-.01131 .60464 -37.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(3) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
+[(0.0003)] .01131 .60499 1 0 Mshowa
.125 Mabswid
-.02381 .03438 m
-.02756 .03438 L
+.02381 .03439 m
+.02756 .03439 L
s
-.02381 .05404 m
-.02756 .05404 L
+.02381 .05407 m
+.02756 .05407 L
s
-.02381 .07371 m
-.02756 .07371 L
+.02381 .07374 m
+.02756 .07374 L
s
-.02381 .09337 m
-.02756 .09337 L
+.02381 .09342 m
+.02756 .09342 L
s
-.02381 .1327 m
-.02756 .1327 L
+.02381 .13277 m
+.02756 .13277 L
s
-.02381 .15237 m
-.02756 .15237 L
+.02381 .15245 m
+.02756 .15245 L
s
-.02381 .17203 m
-.02756 .17203 L
+.02381 .17212 m
+.02756 .17212 L
s
-.02381 .19169 m
-.02756 .19169 L
+.02381 .1918 m
+.02756 .1918 L
s
-.02381 .23102 m
-.02756 .23102 L
+.02381 .23115 m
+.02756 .23115 L
s
-.02381 .25069 m
-.02756 .25069 L
+.02381 .25082 m
+.02756 .25082 L
s
-.02381 .27035 m
-.02756 .27035 L
+.02381 .2705 m
+.02756 .2705 L
s
-.02381 .29002 m
-.02756 .29002 L
+.02381 .29018 m
+.02756 .29018 L
s
-.02381 .32934 m
-.02756 .32934 L
+.02381 .32953 m
+.02756 .32953 L
s
-.02381 .34901 m
-.02756 .34901 L
+.02381 .3492 m
+.02756 .3492 L
s
-.02381 .36867 m
-.02756 .36867 L
+.02381 .36888 m
+.02756 .36888 L
s
-.02381 .38834 m
-.02756 .38834 L
+.02381 .38855 m
+.02756 .38855 L
s
-.02381 .42767 m
-.02756 .42767 L
+.02381 .42791 m
+.02756 .42791 L
s
-.02381 .44733 m
-.02756 .44733 L
+.02381 .44758 m
+.02756 .44758 L
s
-.02381 .46699 m
-.02756 .46699 L
+.02381 .46726 m
+.02756 .46726 L
s
-.02381 .48666 m
-.02756 .48666 L
+.02381 .48693 m
+.02756 .48693 L
s
-.02381 .52599 m
-.02756 .52599 L
+.02381 .52628 m
+.02756 .52628 L
s
-.02381 .54565 m
-.02756 .54565 L
+.02381 .54596 m
+.02756 .54596 L
s
-.02381 .56532 m
-.02756 .56532 L
+.02381 .56563 m
+.02756 .56563 L
s
-.02381 .58498 m
-.02756 .58498 L
+.02381 .58531 m
+.02756 .58531 L
s
.25 Mabswid
.02381 0 m
@@ -1742,85 +1667,85 @@
newpath
0 1 0 r
.5 Mabswid
-.02381 .21136 m
-.06244 .24746 L
-.10458 .27932 L
-.14415 .30346 L
-.18221 .32239 L
-.22272 .33879 L
-.26171 .3516 L
-.30316 .36263 L
+.02381 .21147 m
+.06244 .24757 L
+.10458 .27942 L
+.14415 .30354 L
+.18221 .32246 L
+.22272 .33885 L
+.26171 .35164 L
+.30316 .36265 L
.34309 .37121 L
-.3815 .37793 L
-.42237 .38374 L
-.46172 .38827 L
-.49955 .39182 L
-.53984 .39491 L
-.57861 .39732 L
-.61984 .3994 L
-.65954 .40102 L
-.69774 .40228 L
-.73838 .40338 L
-.77751 .40424 L
-.81909 .40498 L
-.85916 .40555 L
-.89771 .406 L
-.93871 .40639 L
-.97619 .40668 L
+.3815 .37792 L
+.42237 .38371 L
+.46172 .38823 L
+.49955 .39177 L
+.53984 .39485 L
+.57861 .39725 L
+.61984 .39932 L
+.65954 .40093 L
+.69774 .4022 L
+.73838 .40329 L
+.77751 .40414 L
+.81909 .40487 L
+.85916 .40544 L
+.89771 .40589 L
+.93871 .40628 L
+.97619 .40656 L
s
0 0 1 r
-.02381 .408 m
-.06244 .4441 L
-.10458 .47596 L
-.14415 .5001 L
-.18221 .51903 L
-.22272 .53544 L
-.26171 .54825 L
-.30316 .55928 L
-.34309 .56786 L
-.3815 .57457 L
-.42237 .58038 L
-.46172 .58491 L
-.49955 .58846 L
-.53984 .59155 L
-.57861 .59396 L
-.61984 .59604 L
-.65954 .59766 L
-.69774 .59893 L
-.73838 .60003 L
-.77751 .60088 L
-.81909 .60162 L
-.85916 .60219 L
-.89771 .60264 L
+.02381 .40823 m
+.06244 .44433 L
+.10458 .47618 L
+.14415 .5003 L
+.18221 .51922 L
+.22272 .5356 L
+.26171 .5484 L
+.30316 .55941 L
+.34309 .56797 L
+.3815 .57468 L
+.42237 .58047 L
+.46172 .58498 L
+.49955 .58853 L
+.53984 .5916 L
+.57861 .59401 L
+.61984 .59608 L
+.65954 .59769 L
+.69774 .59895 L
+.73838 .60005 L
+.77751 .6009 L
+.81909 .60163 L
+.85916 .6022 L
+.89771 .60265 L
.93871 .60303 L
.97619 .60332 L
s
1 0 0 r
-.02381 .21136 m
-.06244 .17526 L
-.10458 .1434 L
-.14415 .11926 L
-.18221 .10032 L
-.22272 .08392 L
-.26171 .07111 L
-.30316 .06008 L
-.34309 .0515 L
-.3815 .04478 L
-.42237 .03898 L
-.46172 .03445 L
-.49955 .03089 L
-.53984 .02781 L
-.57861 .0254 L
-.61984 .02332 L
-.65954 .0217 L
-.69774 .02043 L
-.73838 .01933 L
-.77751 .01848 L
-.81909 .01774 L
-.85916 .01716 L
-.89771 .01672 L
-.93871 .01633 L
-.97619 .01604 L
+.02381 .21147 m
+.06244 .17538 L
+.10458 .14353 L
+.14415 .1194 L
+.18221 .10048 L
+.22272 .0841 L
+.26171 .0713 L
+.30316 .06029 L
+.34309 .05173 L
+.3815 .04503 L
+.42237 .03923 L
+.46172 .03472 L
+.49955 .03117 L
+.53984 .0281 L
+.57861 .0257 L
+.61984 .02362 L
+.65954 .02201 L
+.69774 .02075 L
+.73838 .01966 L
+.77751 .0188 L
+.81909 .01807 L
+.85916 .0175 L
+.89771 .01705 L
+.93871 .01667 L
+.97619 .01638 L
s
MathSubEnd
P
@@ -1903,10 +1828,10 @@
% End of sub-graphic
0 g
gsave
-.38988 .36957 -61 -10.4375 Mabsadd m
+.38988 .36957 -61 -10.25 Mabsadd m
1 1 Mabs scale
currentpoint translate
-0 20.875 translate 1 -1 scale
+0 20.5 translate 1 -1 scale
/g { setgray} bind def
/k { setcmykcolor} bind def
/p { gsave} bind def
@@ -1927,21 +1852,21 @@
/My {currentpoint pop exch moveto} bind def
/X {0 rmoveto} bind def
/Y {0 exch rmoveto} bind def
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
0.000 0.000 rmoveto
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
(S3) show
-75.000 13.000 moveto
+75.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
@@ -1984,10 +1909,10 @@
% End of sub-graphic
0 g
gsave
-.38988 1 -61 -10.4375 Mabsadd m
+.38988 1 -61 -10.25 Mabsadd m
1 1 Mabs scale
currentpoint translate
-0 20.875 translate 1 -1 scale
+0 20.5 translate 1 -1 scale
/g { setgray} bind def
/k { setcmykcolor} bind def
/p { gsave} bind def
@@ -2008,21 +1933,21 @@
/My {currentpoint pop exch moveto} bind def
/X {0 rmoveto} bind def
/Y {0 exch rmoveto} bind def
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
0.000 0.000 rmoveto
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
(S2) show
-75.000 13.000 moveto
+75.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
@@ -2065,10 +1990,10 @@
% End of sub-graphic
0 g
gsave
-.38988 1.63043 -61 -10.4375 Mabsadd m
+.38988 1.63043 -61 -10.25 Mabsadd m
1 1 Mabs scale
currentpoint translate
-0 20.875 translate 1 -1 scale
+0 20.5 translate 1 -1 scale
/g { setgray} bind def
/k { setcmykcolor} bind def
/p { gsave} bind def
@@ -2089,21 +2014,21 @@
/My {currentpoint pop exch moveto} bind def
/X {0 rmoveto} bind def
/Y {0 exch rmoveto} bind def
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
0.000 0.000 rmoveto
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
(S1) show
-75.000 13.000 moveto
+75.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
Modified: trunk/test-suite/cases/semantic/00046/00046-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00046/00046-results.csv
===================================================================
--- trunk/test-suite/cases/semantic/00046/00046-results.csv 2009-03-17 23:47:48 UTC (rev 9412)
+++ trunk/test-suite/cases/semantic/00046/00046-results.csv 2009-03-18 00:05:24 UTC (rev 9413)
@@ -1,52 +1,52 @@
time,case00046`S1,case00046`S2,case00046`S3
-0,1.e-15,2.e-15,1.e-15
-0.4,1.095162581970295e-15,2.095162581970295e-15,9.048374180297051e-16
-0.8,1.181269246932559e-15,2.181269246932561e-15,8.187307530674402e-16
-1.2,1.259181780663791e-15,2.259181780663792e-15,7.408182193362089e-16
-1.6,1.329679955414388e-15,2.32967995541439e-15,6.70320044585611e-16
-2.,1.393469341793984e-15,2.393469341793986e-15,6.065306582060158e-16
-2.4,1.45118837214135e-15,2.451188372141352e-15,5.488116278586495e-16
-2.8,1.503414705868531e-15,2.503414705868533e-15,4.965852941314687e-16
-3.2,1.550671044989897e-15,2.550671044989899e-15,4.493289550101025e-16
-3.6,1.593430347266306e-15,2.593430347266309e-15,4.065696527336932e-16
-4.,1.632120578287543e-15,2.632120578287546e-15,3.678794217124564e-16
-4.4,1.667128916312874e-15,2.667128916312877e-15,3.328710836871254e-16
-4.8,1.698805788203211e-15,2.698805788203213e-15,3.01194211796789e-16
-5.2,1.727468207069667e-15,2.727468207069669e-15,2.725317929303327e-16
-5.6,1.753403036523009e-15,2.75340303652301e-15,2.465969634769913e-16
-6.,1.776869841081263e-15,2.776869841081264e-15,2.23130158918737e-16
-6.4,1.798103482039245e-15,2.798103482039247e-15,2.018965179607549e-16
-6.8,1.817316476009517e-15,2.817316476009519e-15,1.826835239904821e-16
-7.2,1.834701114295285e-15,2.834701114295287e-15,1.652988857047143e-16
-7.6,1.850431385078339e-15,2.85043138507834e-15,1.495686149216606e-16
-8.,1.864664718722179e-15,2.86466471872218e-15,1.353352812778207e-16
-8.4,1.877543571805048e-15,2.87754357180505e-15,1.224564281949515e-16
-8.8,1.889196849192371e-15,2.889196849192372e-15,1.108031508076291e-16
-9.2,1.899741156533959e-15,2.89974115653396e-15,1.002588434660412e-16
-9.6,1.909282051768373e-15,2.909282051768375e-15,9.071794823162625e-17
-10.,1.91791500504199e-15,2.917915005041991e-15,8.20849949580096e-17
-10.4,1.925726422641095e-15,2.925726422641097e-15,7.42735773589045e-17
-10.8,1.932794491969552e-15,2.932794491969554e-15,6.720550803044694e-17
-11.2,1.939189938012012e-15,2.939189938012014e-15,6.081006198798752e-17
-11.6,1.944976783350232e-15,2.944976783350234e-15,5.502321664976713e-17
-12.,1.950212937170922e-15,2.950212937170923e-15,4.978706282907787e-17
-12.4,1.954950800874627e-15,2.954950800874628e-15,4.504919912537267e-17
-12.8,1.959237796135239e-15,2.959237796135241e-15,4.076220386476044e-17
-13.2,1.963116834196906e-15,2.963116834196908e-15,3.688316580309241e-17
-13.6,1.96662673360837e-15,2.966626733608371e-15,3.337326639162905e-17
-14.,1.969802619254503e-15,2.969802619254504e-15,3.019738074549547e-17
-14.4,1.972676277926121e-15,2.972676277926123e-15,2.732372207387693e-17
-14.8,1.975276474159989e-15,2.97527647415999e-15,2.472352584000922e-17
-15.2,1.977629230328014e-15,2.977629230328015e-15,2.237076967198413e-17
-15.6,1.979758090600221e-15,2.979758090600222e-15,2.024190939977733e-17
-16.,1.981684361657145e-15,2.981684361657147e-15,1.831563834285265e-17
-16.4,1.983427324775434e-15,2.983427324775435e-15,1.657267522456385e-17
-16.8,1.985004424440355e-15,2.985004424440356e-15,1.499557555964301e-17
-17.2,1.986431442465233e-15,2.986431442465235e-15,1.356855753476429e-17
-17.6,1.987722660691374e-15,2.987722660691375e-15,1.227733930862428e-17
-18.,1.988891003478978e-15,2.98889100347898e-15,1.110899652101933e-17
-18.4,1.989948164932499e-15,2.989948164932501e-15,1.005183506749869e-17
-18.8,1.990904723912498e-15,2.9909047239125e-15,9.095276087499552e-18
-19.2,1.991770253503691e-15,2.991770253503693e-15,8.229746496306983e-18
-19.6,1.992553416936566e-15,2.992553416936568e-15,7.446583063431985e-18
-20.,1.993262053000882e-15,2.993262053000884e-15,6.737946999115285e-18
\ No newline at end of file
+0,0.0001,0.0002,0.0001
+0.4,0.0001095101185704268,0.0002095101185704269,0.00009048988142957316
+0.8,0.0001181144069599281,0.0002181144069599282,0.00008188559304007183
+1.2,0.0001258991045544968,0.0002258991045544968,0.0000741008954455032
+1.6,0.0001329422472699064,0.0002329422472699064,0.00006705775273009363
+2.,0.0001393144472761547,0.0002393144472761548,0.00006068555272384526
+2.4,0.0001450795984151714,0.0002450795984151715,0.00005492040158482855
+2.8,0.0001502955121232816,0.0002502955121232817,0.00004970448787671837
+3.2,0.0001550144989238427,0.0002550144989238427,0.00004498550107615731
+3.6,0.0001592838895931068,0.0002592838895931068,0.00004071611040689317
+4.,0.0001631465105444803,0.0002631465105444803,0.00003685348945551974
+4.4,0.0001666411046561742,0.0002666411046561745,0.00003335889534382568
+4.8,0.0001698027350358279,0.0002698027350358282,0.00003019726496417199
+5.2,0.0001726631193237813,0.0002726631193237816,0.0000273368806762186
+5.6,0.0001752509564151416,0.0002752509564151418,0.00002474904358485839
+6.,0.0001775922118992758,0.000277592211899276,0.0000224077881007242
+6.4,0.0001797103780663186,0.0002797103780663189,0.00002028962193368134
+6.8,0.0001816267100701786,0.0002816267100701788,0.00001837328992982138
+7.2,0.0001833604383162523,0.0002833604383162526,0.0000166395616837476
+7.6,0.0001849289608100614,0.0002849289608100616,0.0000150710391899386
+8.,0.0001863480182435769,0.0002863480182435771,0.00001365198175642305
+8.4,0.0001876318525082696,0.0002876318525082699,0.00001236814749173031
+8.8,0.0001887933490866441,0.0002887933490866443,0.00001120665091335583
+9.2,0.0001898441626961193,0.0002898441626961196,0.00001015583730388064
+9.6,0.0001907948424799535,0.0002907948424799538,9.20515752004643e-6
+10.,0.000191654928308744,0.0002916549283087443,8.345071691255907e-6
+10.4,0.0001924330531584597,0.0002924330531584598,7.566946841540313e-6
+10.8,0.0001931370278747662,0.0002931370278747665,6.862972125233738e-6
+11.2,0.0001937739168704251,0.0002937739168704254,6.226083129574812e-6
+11.6,0.0001943501142494414,0.0002943501142494416,5.649885750558534e-6
+12.,0.0001948714027090762,0.0002948714027090764,5.128597290923749e-6
+12.4,0.000195343014303889,0.0002953430143038892,4.656985696110964e-6
+12.8,0.0001957696832021258,0.0002957696832021261,4.230316797874113e-6
+13.2,0.0001961556926907649,0.0002961556926907652,3.844307309234976e-6
+13.6,0.0001965049170114392,0.0002965049170114395,3.495082988560712e-6
+14.,0.0001968208612513208,0.0002968208612513211,3.179138748679095e-6
+14.4,0.0001971066969301388,0.000297106696930139,2.893303069861129e-6
+14.8,0.0001973652936202133,0.0002973652936202136,2.634706379786535e-6
+15.2,0.0001975992470092075,0.0002975992470092078,2.400752990792365e-6
+15.6,0.0001978109052016946,0.0002978109052016948,2.189094798305286e-6
+16.,0.0001980023928351154,0.0002980023928351156,1.997607164884541e-6
+16.4,0.0001981756323031491,0.0002981756323031494,1.824367696850767e-6
+16.8,0.0001983323626750603,0.0002983323626750606,1.667637324939605e-6
+17.2,0.0001984741569924392,0.0002984741569924395,1.525843007560685e-6
+17.6,0.0001986024385593296,0.0002986024385593299,1.397561440670295e-6
+18.,0.0001987184952063118,0.0002987184952063121,1.281504793688099e-6
+18.4,0.0001988234920553257,0.0002988234920553259,1.176507944674233e-6
+18.8,0.0001989184829449158,0.0002989184829449161,1.081517055084097e-6
+19.2,0.0001990044213453334,0.0002990044213453337,9.95578654666521e-7
+19.6,0.0001990821699792793,0.0002990821699792796,9.178300207205713e-7
+20.,0.0001991525093891402,0.0002991525093891405,8.474906108597139e-7
\ No newline at end of file
Modified: trunk/test-suite/cases/semantic/00046/00046-sbml-l2v1.xml
===================================================================
--- trunk/test-suite/cases/semantic/00046/00046-sbml-l2v1.xml 2009-03-17 23:47:48 UTC (rev 9412)
+++ trunk/test-suite/cases/semantic/00046/00046-sbml-l2v1.xml 2009-03-18 00:05:24 UTC (rev 9413)
@@ -5,9 +5,9 @@
<compartment id="compartment" name="compartment" spatialDimensions="1" size="1" units="length"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1e-015" substanceUnits="substance"/>
- <species id="S2" name="S2" compartment="compartment" initialAmount="2e-015" substanceUnits="substance"/>
- <species id="S3" name="S3" compartment="compartment" initialAmount="1e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.0001" substanceUnits="substance"/>
+ <species id="S2" name="S2" compartment="compartment" initialAmount="0.0002" substanceUnits="substance"/>
+ <species id="S3" name="S3" compartment="compartment" initialAmount="0.0001" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
<parameter id="k1" name="k1" value="0.75"/>
Modified: trunk/test-suite/cases/semantic/00046/00046-sbml-l2v2.xml
===================================================================
--- trunk/test-suite/cases/semantic/00046/00046-sbml-l2v2.xml 2009-03-17 23:47:48 UTC (rev 9412)
+++ trunk/test-suite/cases/semantic/00046/00046-sbml-l2v2.xml 2009-03-18 00:05:24 UTC (rev 9413)
@@ -5,9 +5,9 @@
<compartment id="compartment" name="compartment" spatialDimensions="1" size="1" units="length"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1e-015" substanceUnits="substance"/>
- <species id="S2" name="S2" compartment="compartment" initialAmount="2e-015" substanceUnits="substance"/>
- <species id="S3" name="S3" compartment="compartment" initialAmount="1e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.0001" substanceUnits="substance"/>
+ <species id="S2" name="S2" compartment="compartment" initialAmount="0.0002" substanceUnits="substance"/>
+ <species id="S3" name="S3" compartment="compartment" initialAmount="0.0001" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
<parameter id="k1" name="k1" value="0.75"/>
Modified: trunk/test-suite/cases/semantic/00046/00046-sbml-l2v3.xml
===================================================================
--- trunk/test-suite/cases/semantic/00046/00046-sbml-l2v3.xml 2009-03-17 23:47:48 UTC (rev 9412)
+++ trunk/test-suite/cases/semantic/00046/00046-sbml-l2v3.xml 2009-03-18 00:05:24 UTC (rev 9413)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated 7-February-2008 12:16:38.3906250 -->
-<!-- Generated by MathSBML 2.7.1 (7 December 2007) -->
+<!-- Generated 17-March-2009 16:52:29.1562500 -->
+<!-- Generated by MathSBML 2.7.5 [2-May-2008] -->
<!-- Generated using Mathematica Version 5.2 for Microsoft Windows (June 20, 2005) -->
<sbml xmlns="http://www.sbml.org/sbml/level2/version3"
level="2"
@@ -17,7 +17,7 @@
name="compartment"
spatialDimensions="1"
units="length"
- size="1"/>
+ size="1."/>
</listOfCompartments>
<listOfSpecies>
<species id="S1"
@@ -25,7 +25,7 @@
compartment="compartment"
boundaryCondition="false"
constant="false"
- initialAmount="1.e-15"
+ initialAmount="0.0001"
substanceUnits="substance"
hasOnlySubstanceUnits="false"/>
<species id="S2"
@@ -33,7 +33,7 @@
compartment="compartment"
boundaryCondition="false"
constant="false"
- initialAmount="2.e-15"
+ initialAmount="0.0002"
substanceUnits="substance"
hasOnlySubstanceUnits="false"/>
<species id="S3"
@@ -41,7 +41,7 @@
compartment="compartment"
boundaryCondition="false"
constant="false"
- initialAmount="1.e-15"
+ initialAmount="0.0001"
substanceUnits="substance"
hasOnlySubstanceUnits="false"/>
</listOfSpecies>
Modified: trunk/test-suite/cases/semantic/00046/00046-sbml-l2v4.xml
===================================================================
--- trunk/test-suite/cases/semantic/00046/00046-sbml-l2v4.xml 2009-03-17 23:47:48 UTC (rev 9412)
+++ trunk/test-suite/cases/semantic/00046/00046-sbml-l2v4.xml 2009-03-18 00:05:24 UTC (rev 9413)
@@ -5,9 +5,9 @@
<compartment id="compartment" name="compartment" spatialDimensions="1" size="1" units="length"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1e-015" substanceUnits="substance"/>
- <species id="S2" name="S2" compartment="compartment" initialAmount="2e-015" substanceUnits="substance"/>
- <species id="S3" name="S3" compartment="compartment" initialAmount="1e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.0001" substanceUnits="substance"/>
+ <species id="S2" name="S2" compartment="compartment" initialAmount="0.0002" substanceUnits="substance"/>
+ <species id="S3" name="S3" compartment="compartment" initialAmount="0.0001" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
<parameter id="k1" name="k1" value="0.75"/>
Modified: trunk/test-suite/cases/semantic/00046/00046-settings.txt
===================================================================
--- trunk/test-suite/cases/semantic/00046/00046-settings.txt 2009-03-17 23:47:48 UTC (rev 9412)
+++ trunk/test-suite/cases/semantic/00046/00046-settings.txt 2009-03-18 00:05:24 UTC (rev 9413)
@@ -2,7 +2,7 @@
duration: 20.0
steps: 50
variables: S1, S2, S3
-absolute: 0.0000000000000000001
+absolute: 1.000000e-007
relative: 0.0001
amount: S1, S2, S3
concentration:
Modified: trunk/test-suite/cases/semantic/00047/00047-model.m
===================================================================
--- trunk/test-suite/cases/semantic/00047/00047-model.m 2009-03-17 23:47:48 UTC (rev 9412)
+++ trunk/test-suite/cases/semantic/00047/00047-model.m 2009-03-18 00:05:24 UTC (rev 9413)
@@ -21,12 +21,12 @@
The initial conditions are as follows:
[{width:30em,margin-left:5em}| |*Value* |*Units* |
-|Initial amount of S1 |$1.0 \x 10^-15$ |mole |
-|Initial amount of S2 |$1.0 \x 10^-15$ |mole |
-|Initial amount of S3 |$2.0 \x 10^-15$ |mole |
-|Initial amount of S4 |$1.0 \x 10^-15$ |mole |
-|Value of parameter k1 |$0.75 \x 10^15$ |metre mole^-1^ second^-1^ |
-|Value of parameter k2 |$0.25 \x 10^15$ |mtere mole^-1^ second^-1^ |
+|Initial amount of S1 |$1.0 \x 10^-3$ |mole |
+|Initial amount of S2 |$1.0 \x 10^-3$ |mole |
+|Initial amount of S3 |$2.0 \x 10^-3$ |mole |
+|Initial amount of S4 |$1.0 \x 10^-3$ |mole |
+|Value of parameter k1 |$0.75 \x 10^3$ |metre mole^-1^ second^-1^ |
+|Value of parameter k2 |$0.25 \x 10^3$ |mtere mole^-1^ second^-1^ |
|Length of compartment "compartment" |$ 1$ |metre |]
The species values are given as amounts of substance to make it easier to
@@ -39,12 +39,12 @@
newcase[ "00047" ];
addCompartment[ compartment, spatialDimensions-> 1, size -> 1 ];
-addSpecies[ S1, initialAmount -> 1.0 10^-15];
-addSpecies[ S2, initialAmount -> 1.0 10^-15];
-addSpecies[ S3, initialAmount -> 2.0 10^-15];
-addSpecies[ S4, initialAmount -> 1.0 10^-15];
-addParameter[ k1, value -> 0.75 10^15 ];
-addParameter[ k2, value -> 0.25 10^15 ];
+addSpecies[ S1, initialAmount -> 1.0 10^-3];
+addSpecies[ S2, initialAmount -> 1.0 10^-3];
+addSpecies[ S3, initialAmount -> 2.0 10^-3];
+addSpecies[ S4, initialAmount -> 1.0 10^-3];
+addParameter[ k1, value -> 0.75 10^3 ];
+addParameter[ k2, value -> 0.25 10^3 ];
addReaction[ S1 + S2 -> S3 + S4, reversible -> False,
kineticLaw -> k1 * S1 * S2 * compartment ];
addReaction[ S3 + S4 -> S1 + S2, reversible -> False,
Modified: trunk/test-suite/cases/semantic/00047/00047-plot.eps
===================================================================
--- trunk/test-suite/cases/semantic/00047/00047-plot.eps 2009-03-17 23:47:48 UTC (rev 9412)
+++ trunk/test-suite/cases/semantic/00047/00047-plot.eps 2009-03-18 00:05:24 UTC (rev 9413)
@@ -2,16 +2,13 @@
%%BoundingBox: 88 4 376 144
%%HiResBoundingBox: 88 4 376 143.563
%%Creator: (Mathematica 5.2 for Microsoft Windows)
-%%CreationDate: (Thursday, February 7, 2008) (12:20:37)
+%%CreationDate: (Tuesday, March 17, 2009) (16:52:35)
%%Title: Clipboard
-%%DocumentNeededResources: font Math1Mono
-%%+ font Courier
+%%DocumentNeededResources: font Courier
%%DocumentSuppliedResources:
-%%DocumentNeededFonts: Math1Mono
-%%+ Courier
+%%DocumentNeededFonts: Courier
%%DocumentSuppliedFonts:
-%%DocumentFonts: Math1Mono
-%%+ Courier
+%%DocumentFonts: Courier
%%EndComments
0 147.563 translate 1 -1 scale
150 dict begin
@@ -1173,11 +1170,11 @@
/Y {0 exch rmoveto} bind def
gsave
newpath
- 149.375 109.563 moveto
- 277.625 109.563 lineto
- 277.625 30.313 lineto
- 149.375 30.313 lineto
- 149.375 109.563 lineto
+ 129.688 118.500 moveto
+ 277.188 118.500 lineto
+ 277.188 27.313 lineto
+ 129.688 27.313 lineto
+ 129.688 118.500 lineto
closepath
clip newpath
grestore
@@ -1440,33 +1437,29 @@
%%IncludeFont: Courier
/Courier findfont 10 scalefont setfont
% Scaling calculations
-0.0238095 0.380952 -0.171676 3.43352e+014 [
-[.21429 -0.0125 -9 -9 ]
-[.21429 -0.0125 9 0 ]
-[.40476 -0.0125 -3 -9 ]
-[.40476 -0.0125 3 0 ]
-[.59524 -0.0125 -9 -9 ]
-[.59524 -0.0125 9 0 ]
-[.78571 -0.0125 -3 -9 ]
-[.78571 -0.0125 3 0 ]
-[.97619 -0.0125 -9 -9 ]
-[.97619 -0.0125 9 0 ]
-[1.025 0 0 -6.4375 ]
-[1.025 0 28 6.4375 ]
-[.01131 .08584 -49.5 -6.25 ]
-[.01131 .08584 0 6.25 ]
-[.01131 .17168 -37.5 -6.25 ]
-[.01131 .17168 0 6.25 ]
-[.01131 .25751 -55.5 -6.25 ]
-[.01131 .25751 0 6.25 ]
-[.01131 .34335 -49.5 -6.25 ]
-[.01131 .34335 0 6.25 ]
-[.01131 .42919 -55.5 -6.25 ]
-[.01131 .42919 0 6.25 ]
-[.01131 .51503 -37.5 -6.25 ]
-[.01131 .51503 0 6.25 ]
-[.01131 .60087 -55.5 -6.25 ]
-[.01131 .60087 0 6.25 ]
+0.0238095 0.380952 -0.410587 479.736 [
+[.21429 .05665 -9 -9 ]
+[.21429 .05665 9 0 ]
+[.40476 .05665 -3 -9 ]
+[.40476 .05665 3 0 ]
+[.59524 .05665 -9 -9 ]
+[.59524 .05665 9 0 ]
+[.78571 .05665 -3 -9 ]
+[.78571 .05665 3 0 ]
+[.97619 .05665 -9 -9 ]
+[.97619 .05665 9 0 ]
+[1.025 .06915 0 -6.25 ]
+[1.025 .06915 28 6.25 ]
+[.01131 .1651 -36 -4.5 ]
+[.01131 .1651 0 4.5 ]
+[.01131 .26104 -36 -4.5 ]
+[.01131 .26104 0 4.5 ]
+[.01131 .35699 -36 -4.5 ]
+[.01131 .35699 0 4.5 ]
+[.01131 .45294 -36 -4.5 ]
+[.01131 .45294 0 4.5 ]
+[.01131 .54888 -30 -4.5 ]
+[.01131 .54888 0 4.5 ]
[ 0 0 0 0 ]
[ 1 .61803 0 0 ]
] MathScale
@@ -1477,96 +1470,96 @@
0 g
.25 Mabswid
[ ] 0 setdash
-.21429 0 m
-.21429 .00625 L
+.21429 .06915 m
+.21429 .0754 L
s
-[(0.5)] .21429 -0.0125 0 1 Mshowa
-.40476 0 m
-.40476 .00625 L
+[(0.5)] .21429 .05665 0 1 Mshowa
+.40476 .06915 m
+.40476 .0754 L
s
-[(1)] .40476 -0.0125 0 1 Mshowa
-.59524 0 m
-.59524 .00625 L
+[(1)] .40476 .05665 0 1 Mshowa
+.59524 .06915 m
+.59524 .0754 L
s
-[(1.5)] .59524 -0.0125 0 1 Mshowa
-.78571 0 m
-.78571 .00625 L
+[(1.5)] .59524 .05665 0 1 Mshowa
+.78571 .06915 m
+.78571 .0754 L
s
-[(2)] .78571 -0.0125 0 1 Mshowa
-.97619 0 m
-.97619 .00625 L
+[(2)] .78571 .05665 0 1 Mshowa
+.97619 .06915 m
+.97619 .0754 L
s
-[(2.5)] .97619 -0.0125 0 1 Mshowa
+[(2.5)] .97619 .05665 0 1 Mshowa
.125 Mabswid
-.0619 0 m
-.0619 .00375 L
+.0619 .06915 m
+.0619 .0729 L
s
-.1 0 m
-.1 .00375 L
+.1 .06915 m
+.1 .0729 L
s
-.1381 0 m
-.1381 .00375 L
+.1381 .06915 m
+.1381 .0729 L
s
-.17619 0 m
-.17619 .00375 L
+.17619 .06915 m
+.17619 .0729 L
s
-.25238 0 m
-.25238 .00375 L
+.25238 .06915 m
+.25238 .0729 L
s
-.29048 0 m
-.29048 .00375 L
+.29048 .06915 m
+.29048 .0729 L
s
-.32857 0 m
-.32857 .00375 L
+.32857 .06915 m
+.32857 .0729 L
s
-.36667 0 m
-.36667 .00375 L
+.36667 .06915 m
+.36667 .0729 L
s
-.44286 0 m
-.44286 .00375 L
+.44286 .06915 m
+.44286 .0729 L
s
-.48095 0 m
-.48095 .00375 L
+.48095 .06915 m
+.48095 .0729 L
s
-.51905 0 m
-.51905 .00375 L
+.51905 .06915 m
+.51905 .0729 L
s
-.55714 0 m
-.55714 .00375 L
+.55714 .06915 m
+.55714 .0729 L
s
-.63333 0 m
-.63333 .00375 L
+.63333 .06915 m
+.63333 .0729 L
s
-.67143 0 m
-.67143 .00375 L
+.67143 .06915 m
+.67143 .0729 L
s
-.70952 0 m
-.70952 .00375 L
+.70952 .06915 m
+.70952 .0729 L
s
-.74762 0 m
-.74762 .00375 L
+.74762 .06915 m
+.74762 .0729 L
s
-.82381 0 m
-.82381 .00375 L
+.82381 .06915 m
+.82381 .0729 L
s
-.8619 0 m
-.8619 .00375 L
+.8619 .06915 m
+.8619 .0729 L
s
-.9 0 m
-.9 .00375 L
+.9 .06915 m
+.9 .0729 L
s
-.9381 0 m
-.9381 .00375 L
+.9381 .06915 m
+.9381 .0729 L
s
.25 Mabswid
-0 0 m
-1 0 L
+0 .06915 m
+1 .06915 L
s
gsave
-1.025 0 -61 -10.4375 Mabsadd m
+1.025 .06915 -61 -10.25 Mabsadd m
1 1 Mabs scale
currentpoint translate
-0 20.875 translate 1 -1 scale
+0 20.5 translate 1 -1 scale
/g { setgray} bind def
/k { setcmykcolor} bind def
/p { gsave} bind def
@@ -1587,212 +1580,107 @@
/My {currentpoint pop exch moveto} bind def
/X {0 rmoveto} bind def
/Y {0 exch rmoveto} bind def
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
+0.000 0.000 rmoveto
+63.000 12.750 moveto
+%%IncludeResource: font Courier
+%%IncludeFont: Courier
+/Courier findfont 10.000 scalefont
+[1 0 0 -1 0 0 ] makefont setfont
+0.000 0.000 0.000 setrgbcolor
(Time) show
+87.000 12.750 moveto
+%%IncludeResource: font Courier
+%%IncludeFont: Courier
+/Courier findfont 10.000 scalefont
+[1 0 0 -1 0 0 ] makefont setfont
+0.000 0.000 0.000 setrgbcolor
+0.000 0.000 rmoveto
1.000 setlinewidth
grestore
-.02381 .08584 m
-.03006 .08584 L
+.02381 .1651 m
+.03006 .1651 L
s
-gsave
-.01131 .08584 -49.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(7.5) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-16) show
-grestore
-.02381 .17168 m
-.03006 .17168 L
+[(0.0012)] .01131 .1651 1 0 Mshowa
+.02381 .26104 m
+.03006 .26104 L
s
-gsave
-.01131 .17168 -37.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(1) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
-.02381 .25751 m
-.03006 .25751 L
+[(0.0014)] .01131 .26104 1 0 Mshowa
+.02381 .35699 m
+.03006 .35699 L
s
-gsave
-.01131 .25751 -55.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(1.25) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
-.02381 .34335 m
-.03006 .34335 L
+[(0.0016)] .01131 .35699 1 0 Mshowa
+.02381 .45294 m
+.03006 .45294 L
s
-gsave
-.01131 .34335 -49.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(1.5) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
-.02381 .42919 m
-.03006 .42919 L
+[(0.0018)] .01131 .45294 1 0 Mshowa
+.02381 .54888 m
+.03006 .54888 L
s
-gsave
-.01131 .42919 -55.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(1.75) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
-.02381 .51503 m
-.03006 .51503 L
-s
-gsave
-.01131 .51503 -37.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(2) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
-.02381 .60087 m
-.03006 .60087 L
-s
-gsave
-.01131 .60087 -55.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(2.25) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
+[(0.002)] .01131 .54888 1 0 Mshowa
.125 Mabswid
-.02381 .01717 m
-.02756 .01717 L
+.02381 .09314 m
+.02756 .09314 L
s
-.02381 .03434 m
-.02756 .03434 L
+.02381 .11712 m
+.02756 .11712 L
s
-.02381 .0515 m
-.02756 .0515 L
+.02381 .14111 m
+.02756 .14111 L
s
-.02381 .06867 m
-.02756 .06867 L
+.02381 .18908 m
+.02756 .18908 L
s
-.02381 .10301 m
-.02756 .10301 L
+.02381 .21307 m
+.02756 .21307 L
s
-.02381 .12017 m
-.02756 .12017 L
+.02381 .23706 m
+.02756 .23706 L
s
-.02381 .13734 m
-.02756 .13734 L
+.02381 .28503 m
+.02756 .28503 L
s
-.02381 .15451 m
-.02756 .15451 L
-s
-.02381 .18884 m
-.02756 .18884 L
-s
-.02381 .20601 m
-.02756 .20601 L
-s
-.02381 .22318 m
-.02756 .22318 L
-s
-.02381 .24035 m
-.02756 .24035 L
-s
-.02381 .27468 m
-.02756 .27468 L
-s
-.02381 .29185 m
-.02756 .29185 L
-s
.02381 .30902 m
.02756 .30902 L
s
-.02381 .32618 m
-.02756 .32618 L
+.02381 .333 m
+.02756 .333 L
s
-.02381 .36052 m
-.02756 .36052 L
+.02381 .38098 m
+.02756 .38098 L
s
-.02381 .37769 m
-.02756 .37769 L
+.02381 .40496 m
+.02756 .40496 L
s
-.02381 .39486 m
-.02756 .39486 L
+.02381 .42895 m
+.02756 .42895 L
s
-.02381 .41202 m
-.02756 .41202 L
+.02381 .47692 m
+.02756 .47692 L
s
-.02381 .44636 m
-.02756 .44636 L
+.02381 .50091 m
+.02756 .50091 L
s
-.02381 .46353 m
-.02756 .46353 L
+.02381 .5249 m
+.02756 .5249 L
s
-.02381 .48069 m
-.02756 .48069 L
+.02381 .04516 m
+.02756 .04516 L
s
-.02381 .49786 m
-.02756 .49786 L
+.02381 .02118 m
+.02756 .02118 L
s
-.02381 .5322 m
-.02756 .5322 L
+.02381 .57287 m
+.02756 .57287 L
s
-.02381 .54936 m
-.02756 .54936 L
+.02381 .59686 m
+.02756 .59686 L
s
-.02381 .56653 m
-.02756 .56653 L
-s
-.02381 .5837 m
-.02756 .5837 L
-s
.25 Mabswid
.02381 0 m
.02381 .61803 L
@@ -1806,112 +1694,112 @@
newpath
.5 1 0 r
.5 Mabswid
-.02381 .17168 m
-.06244 .16389 L
-.10458 .15718 L
-.14415 .15221 L
-.18221 .14839 L
-.22272 .14514 L
-.26171 .14265 L
-.30316 .14054 L
-.34309 .13893 L
-.3815 .13768 L
-.42237 .13663 L
-.46172 .13581 L
-.49955 .13519 L
-.53984 .13465 L
-.57861 .13424 L
-.61984 .13388 L
-.65954 .13361 L
-.69774 .13341 L
-.73838 .13323 L
-.77751 .13309 L
-.81909 .13298 L
-.85916 .13289 L
-.89771 .13282 L
-.93871 .13276 L
-.97619 .13272 L
+.02381 .06915 m
+.06244 .05827 L
+.10458 .0489 L
+.14415 .04195 L
+.18221 .03661 L
+.22272 .03207 L
+.26171 .02859 L
+.30316 .02564 L
+.34309 .02339 L
+.3815 .02165 L
+.42237 .02018 L
+.46172 .01904 L
+.49955 .01816 L
+.53984 .01741 L
+.57861 .01684 L
+.61984 .01635 L
+.65954 .01597 L
+.69774 .01568 L
+.73838 .01543 L
+.77751 .01524 L
+.81909 .01508 L
+.85916 .01495 L
+.89771 .01486 L
+.93871 .01477 L
+.97619 .01472 L
s
0 1 1 r
-.02381 .17168 m
-.06244 .16389 L
-.10458 .15718 L
-.14415 .15221 L
-.18221 .14839 L
-.22272 .14514 L
-.26171 .14265 L
-.30316 .14054 L
-.34309 .13893 L
-.3815 .13768 L
-.42237 .13663 L
-.46172 .13581 L
-.49955 .13519 L
-.53984 .13465 L
-.57861 .13424 L
-.61984 .13388 L
-.65954 .13361 L
-.69774 .13341 L
-.73838 .13323 L
-.77751 .13309 L
-.81909 .13298 L
-.85916 .13289 L
-.89771 .13282 L
-.93871 .13276 L
-.97619 .13272 L
+.02381 .06915 m
+.06244 .05827 L
+.10458 .0489 L
+.14415 .04195 L
+.18221 .03661 L
+.22272 .03207 L
+.26171 .02859 L
+.30316 .02564 L
+.34309 .02339 L
+.3815 .02165 L
+.42237 .02018 L
+.46172 .01904 L
+.49955 .01816 L
+.53984 .01741 L
+.57861 .01684 L
+.61984 .01635 L
+.65954 .01597 L
+.69774 .01568 L
+.73838 .01543 L
+.77751 .01524 L
+.81909 .01508 L
+.85916 .01495 L
+.89771 .01486 L
+.93871 .01477 L
+.97619 .01472 L
s
.5 0 1 r
-.02381 .51503 m
-.06244 .52281 L
-.10458 .52952 L
-.14415 .53449 L
-.18221 .53832 L
-.22272 .54156 L
-.26171 .54406 L
-.30316 .54617 L
-.34309 .54778 L
-.3815 .54902 L
-.42237 .55008 L
-.46172 .55089 L
-.49955 .55152 L
-.53984 .55206 L
-.57861 .55247 L
-.61984 .55282 L
-.65954 .55309 L
-.69774 .5533 L
-.73838 .55348 L
-.77751 .55361 L
-.81909 .55373 L
-.85916 .55382 L
-.89771 .55389 L
-.93871 .55394 L
-.97619 .55399 L
+.02381 .54888 m
+.06244 .55976 L
+.10458 .56914 L
+.14415 .57608 L
+.18221 .58142 L
+.22272 .58596 L
+.26171 .58944 L
+.30316 .59239 L
+.34309 .59464 L
+.3815 .59638 L
+.42237 .59786 L
+.46172 .59899 L
+.49955 .59987 L
+.53984 .60062 L
+.57861 .6012 L
+.61984 .60169 L
+.65954 .60207 L
+.69774 .60236 L
+.73838 .6026 L
+.77751 .6028 L
+.81909 .60296 L
+.85916 .60308 L
+.89771 .60318 L
+.93871 .60326 L
+.97619 .60332 L
s
1 0 0 r
-.02381 .17168 m
-.06244 .17946 L
-.10458 .18617 L
-.14415 .19114 L
-.18221 .19496 L
-.22272 .19821 L
-.26171 .2007 L
-.30316 .20281 L
-.34309 .20443 L
-.3815 .20567 L
-.42237 .20673 L
-.46172 .20754 L
-.49955 .20817 L
-.53984 .2087 L
-.57861 .20912 L
-.61984 .20947 L
-.65954 .20974 L
-.69774 .20995 L
-.73838 .21012 L
-.77751 .21026 L
-.81909 .21038 L
-.85916 .21047 L
-.89771 .21053 L
-.93871 .21059 L
-.97619 .21064 L
+.02381 .06915 m
+.06244 .08003 L
+.10458 .0894 L
+.14415 .09635 L
+.18221 .10169 L
+.22272 .10623 L
+.26171 .10971 L
+.30316 .11265 L
+.34309 .11491 L
+.3815 .11664 L
+.42237 .11812 L
+.46172 .11926 L
+.49955 .12013 L
+.53984 .12088 L
+.57861 .12146 L
+.61984 .12195 L
+.65954 .12233 L
+.69774 .12262 L
+.73838 .12287 L
+.77751 .12306 L
+.81909 .12322 L
+.85916 .12335 L
+.89771 .12344 L
+.93871 .12352 L
+.97619 .12358 L
s
MathSubEnd
P
@@ -1994,10 +1882,10 @@
% End of sub-graphic
0 g
gsave
-.38988 .28099 -61 -10.4375 Mabsadd m
+.38988 .28099 -61 -10.25 Mabsadd m
1 1 Mabs scale
currentpoint translate
-0 20.875 translate 1 -1 scale
+0 20.5 translate 1 -1 scale
/g { setgray} bind def
/k { setcmykcolor} bind def
/p { gsave} bind def
@@ -2018,21 +1906,21 @@
/My {currentpoint pop exch moveto} bind def
/X {0 rmoveto} bind def
/Y {0 exch rmoveto} bind def
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
0.000 0.000 rmoveto
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
(S4) show
-75.000 13.000 moveto
+75.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
@@ -2075,10 +1963,10 @@
% End of sub-graphic
0 g
gsave
-.38988 .76033 -61 -10.4375 Mabsadd m
+.38988 .76033 -61 -10.25 Mabsadd m
1 1 Mabs scale
currentpoint translate
-0 20.875 translate 1 -1 scale
+0 20.5 translate 1 -1 scale
/g { setgray} bind def
/k { setcmykcolor} bind def
/p { gsave} bind def
@@ -2099,21 +1987,21 @@
/My {currentpoint pop exch moveto} bind def
/X {0 rmoveto} bind def
/Y {0 exch rmoveto} bind def
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
0.000 0.000 rmoveto
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
(S3) show
-75.000 13.000 moveto
+75.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
@@ -2156,10 +2044,10 @@
% End of sub-graphic
0 g
gsave
-.38988 1.23967 -61 -10.4375 Mabsadd m
+.38988 1.23967 -61 -10.25 Mabsadd m
1 1 Mabs scale
currentpoint translate
-0 20.875 translate 1 -1 scale
+0 20.5 translate 1 -1 scale
/g { setgray} bind def
/k { setcmykcolor} bind def
/p { gsave} bind def
@@ -2180,21 +2068,21 @@
/My {currentpoint pop exch moveto} bind def
/X {0 rmoveto} bind def
/Y {0 exch rmoveto} bind def
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
0.000 0.000 rmoveto
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
(S2) show
-75.000 13.000 moveto
+75.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
@@ -2237,10 +2125,10 @@
% End of sub-graphic
0 g
gsave
-.38988 1.71901 -61 -10.4375 Mabsadd m
+.38988 1.71901 -61 -10.25 Mabsadd m
1 1 Mabs scale
currentpoint translate
-0 20.875 translate 1 -1 scale
+0 20.5 translate 1 -1 scale
/g { setgray} bind def
/k { setcmykcolor} bind def
/p { gsave} bind def
@@ -2261,21 +2149,21 @@
/My {currentpoint pop exch moveto} bind def
/X {0 rmoveto} bind def
/Y {0 exch rmoveto} bind def
-63.000 13.000 moveto
+63.000 12.750 moveto
%%In...
[truncated message content] |
|
From: <sar...@us...> - 2009-03-17 23:47:51
|
Revision: 9412
http://sbml.svn.sourceforge.net/sbml/?rev=9412&view=rev
Author: sarahkeating
Date: 2009-03-17 23:47:48 +0000 (Tue, 17 Mar 2009)
Log Message:
-----------
changes values used so that tolerance does not exceed machine double precision
Modified Paths:
--------------
trunk/test-suite/cases/semantic/00042/00042-model.m
trunk/test-suite/cases/semantic/00042/00042-results.csv
trunk/test-suite/cases/semantic/00042/00042-sbml-l2v1.xml
trunk/test-suite/cases/semantic/00042/00042-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00042/00042-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00042/00042-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00042/00042-settings.txt
trunk/test-suite/cases/semantic/00043/00043-model.m
trunk/test-suite/cases/semantic/00043/00043-plot.eps
trunk/test-suite/cases/semantic/00043/00043-plot.jpg
trunk/test-suite/cases/semantic/00043/00043-results.csv
trunk/test-suite/cases/semantic/00043/00043-sbml-l2v1.xml
trunk/test-suite/cases/semantic/00043/00043-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00043/00043-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00043/00043-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00043/00043-settings.txt
trunk/test-suite/cases/semantic/00044/00044-model.m
trunk/test-suite/cases/semantic/00044/00044-plot.eps
trunk/test-suite/cases/semantic/00044/00044-plot.jpg
trunk/test-suite/cases/semantic/00044/00044-results.csv
trunk/test-suite/cases/semantic/00044/00044-sbml-l2v1.xml
trunk/test-suite/cases/semantic/00044/00044-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00044/00044-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00044/00044-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00044/00044-settings.txt
Modified: trunk/test-suite/cases/semantic/00042/00042-model.m
===================================================================
--- trunk/test-suite/cases/semantic/00042/00042-model.m 2009-03-17 23:40:25 UTC (rev 9411)
+++ trunk/test-suite/cases/semantic/00042/00042-model.m 2009-03-17 23:47:48 UTC (rev 9412)
@@ -20,7 +20,7 @@
The initial conditions are as follows:
[{width:30em,margin-left:5em}| |*Value* |*Units* |
-|Initial amount of S1 |$1.5 \x 10^-15$ |mole |
+|Initial amount of S1 |$1.5 \x 10^-4$ |mole |
|Initial amount of S2 |$ 0$ |mole |
|Value of parameter k1 |$ 1$ |second^-1^ |
|Area of compartment "compartment" |$1$ |metre^2^ |]
@@ -38,7 +38,7 @@
newcase[ "00042" ];
addCompartment[ compartment, spatialDimensions-> 2, size -> 1 ];
-addSpecies[ S1, initialAmount -> 1.5 10^-15 ];
+addSpecies[ S1, initialAmount -> 1.5 10^-4 ];
addSpecies[ S2, initialAmount -> 0 ];
addParameter[ k1, value -> 1 ];
addReaction[ S1 -> S2, reversible -> False,
Modified: trunk/test-suite/cases/semantic/00042/00042-results.csv
===================================================================
--- trunk/test-suite/cases/semantic/00042/00042-results.csv 2009-03-17 23:40:25 UTC (rev 9411)
+++ trunk/test-suite/cases/semantic/00042/00042-results.csv 2009-03-17 23:47:48 UTC (rev 9412)
@@ -1,52 +1,52 @@
-time,case00042`S1,case00042`S2
-0,1.5e-015,0
-0.1,1.35726e-015,1.42744e-016
-0.2,1.2281e-015,2.71904e-016
-0.3,1.11123e-015,3.88773e-016
-0.4,1.00548e-015,4.9452e-016
-0.5,9.09796e-016,5.90204e-016
-0.6,8.23217e-016,6.76783e-016
-0.7,7.44878e-016,7.55122e-016
-0.8,6.73993e-016,8.26007e-016
-0.9,6.09854e-016,8.90146e-016
-1,5.51819e-016,9.48181e-016
-1.1,4.99307e-016,1.00069e-015
-1.2,4.51791e-016,1.04821e-015
-1.3,4.08798e-016,1.0912e-015
-1.4,3.69895e-016,1.1301e-015
-1.5,3.34695e-016,1.1653e-015
-1.6,3.02845e-016,1.19716e-015
-1.7,2.74025e-016,1.22597e-015
-1.8,2.47948e-016,1.25205e-015
-1.9,2.24353e-016,1.27565e-015
-2,2.03003e-016,1.297e-015
-2.1,1.83685e-016,1.31632e-015
-2.2,1.66205e-016,1.3338e-015
-2.3,1.50388e-016,1.34961e-015
-2.4,1.36077e-016,1.36392e-015
-2.5,1.23127e-016,1.37687e-015
-2.6,1.1141e-016,1.38859e-015
-2.7,1.00808e-016,1.39919e-015
-2.8,9.12151e-017,1.40878e-015
-2.9,8.25348e-017,1.41747e-015
-3,7.46806e-017,1.42532e-015
-3.1,6.75738e-017,1.43243e-015
-3.2,6.11433e-017,1.43886e-015
-3.3,5.53248e-017,1.44468e-015
-3.4,5.00599e-017,1.44994e-015
-3.5,4.52961e-017,1.4547e-015
-3.6,4.09856e-017,1.45901e-015
-3.7,3.70853e-017,1.46291e-015
-3.8,3.35562e-017,1.46644e-015
-3.9,3.03629e-017,1.46964e-015
-4,2.74735e-017,1.47253e-015
-4.1,2.4859e-017,1.47514e-015
-4.2,2.24934e-017,1.47751e-015
-4.3,2.03528e-017,1.47965e-015
-4.4,1.8416e-017,1.48158e-015
-4.5,1.66635e-017,1.48334e-015
-4.6,1.50778e-017,1.48492e-015
-4.7,1.36429e-017,1.48636e-015
-4.8,1.23446e-017,1.48766e-015
-4.9,1.11699e-017,1.48883e-015
-5,1.01069e-017,1.48989e-015
\ No newline at end of file
+time,S1,S2
+0,0.00015,0
+0.1,0.0001357256127053939,1.427438729460607e-005
+0.2,0.0001228096129616973,2.719038703830272e-005
+0.3,0.0001111227331022577,3.887726689774233e-005
+0.4,0.0001005480069053459,4.945199309465411e-005
+0.5,9.097959895689501e-005,5.902040104310499e-005
+0.6,8.232174541410396e-005,6.767825458589604e-005
+0.7,7.448779556871142e-005,7.551220443128858e-005
+0.8,6.739934461758323e-005,8.260065538241677e-005
+0.9,6.098544896108986e-005,8.901455103891014e-005
+1,5.518191617571635e-005,9.481808382428365e-005
+1.1,4.993066255471193e-005,0.0001000693374452881
+1.2,4.517913178683031e-005,0.0001048208682131697
+1.3,4.087976895510189e-005,0.0001091202310448981
+1.4,3.698954459124097e-005,0.000113010455408759
+1.5,3.346952402226447e-005,0.0001165304759777355
+1.6,3.028447769919831e-005,0.0001197155223008017
+1.7,2.740252860791019e-005,0.0001225974713920898
+1.8,2.479483323323798e-005,0.000125205166766762
+1.9,2.243529288339526e-005,0.0001275647071166047
+2,2.03002924854919e-005,0.0001296997075145081
+2.1,1.836846423794729e-005,0.0001316315357620527
+2.2,1.662047375435008e-005,0.0001333795262456499
+2.3,1.503882655842056e-005,0.0001349611734415794
+2.4,1.360769299341187e-005,0.0001363923070065881
+2.5,1.231274979358482e-005,0.0001376872502064152
+2.6,1.114103673215008e-005,0.0001388589632678499
+2.7,1.008082691096246e-005,0.0001399191730890375
+2.8,9.121509393782692e-006,0.0001408784906062173
+2.9,8.253483008461082e-006,0.0001417465169915389
+3,7.468060255179591e-006,0.0001425319397448204
+3.1,6.757380359033671e-006,0.0001432426196409663
+3.2,6.114330596754931e-006,0.0001438856694032451
+3.3,5.532475110186e-006,0.000144467524889814
+3.4,5.00599049404891e-006,0.0001449940095059511
+3.5,4.529607513347775e-006,0.0001454703924866522
+3.6,4.098558367093884e-006,0.0001459014416329061
+3.7,3.708528970550908e-006,0.0001462914710294491
+3.8,3.355615778424839e-006,0.0001466443842215752
+3.9,3.036286716870657e-006,0.0001469637132831294
+4,2.747345833310127e-006,0.0001472526541666899
+4.1,2.485901310264186e-006,0.0001475140986897358
+4.2,2.249336523071655e-006,0.0001477506634769283
+4.3,2.03528385183014e-006,0.0001479647161481699
+4.4,1.841600985460266e-006,0.0001481583990145397
+4.5,1.666349480736346e-006,0.0001483336505192637
+4.6,1.507775361695036e-006,0.000148492224638305
+4.7,1.364291565254372e-006,0.0001486357084347456
+4.8,1.234462057353003e-006,0.000148765537942647
+4.9,1.116987460638651e-006,0.0001488830125393614
+5,1.01069204986282e-006,0.0001489893079501372
Modified: trunk/test-suite/cases/semantic/00042/00042-sbml-l2v1.xml
===================================================================
--- trunk/test-suite/cases/semantic/00042/00042-sbml-l2v1.xml 2009-03-17 23:40:25 UTC (rev 9411)
+++ trunk/test-suite/cases/semantic/00042/00042-sbml-l2v1.xml 2009-03-17 23:47:48 UTC (rev 9412)
@@ -5,7 +5,7 @@
<compartment id="compartment" name="compartment" spatialDimensions="2" size="1" units="area"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1.5e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.00015" substanceUnits="substance"/>
<species id="S2" name="S2" compartment="compartment" initialAmount="0" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
Modified: trunk/test-suite/cases/semantic/00042/00042-sbml-l2v2.xml
===================================================================
--- trunk/test-suite/cases/semantic/00042/00042-sbml-l2v2.xml 2009-03-17 23:40:25 UTC (rev 9411)
+++ trunk/test-suite/cases/semantic/00042/00042-sbml-l2v2.xml 2009-03-17 23:47:48 UTC (rev 9412)
@@ -5,7 +5,7 @@
<compartment id="compartment" name="compartment" spatialDimensions="2" size="1" units="area"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1.5e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.00015" substanceUnits="substance"/>
<species id="S2" name="S2" compartment="compartment" initialAmount="0" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
Modified: trunk/test-suite/cases/semantic/00042/00042-sbml-l2v3.xml
===================================================================
--- trunk/test-suite/cases/semantic/00042/00042-sbml-l2v3.xml 2009-03-17 23:40:25 UTC (rev 9411)
+++ trunk/test-suite/cases/semantic/00042/00042-sbml-l2v3.xml 2009-03-17 23:47:48 UTC (rev 9412)
@@ -25,7 +25,7 @@
compartment="compartment"
boundaryCondition="false"
constant="false"
- initialAmount="1.5000000000000001e-15"
+ initialAmount="1.5e-4"
substanceUnits="substance"
hasOnlySubstanceUnits="false"/>
<species id="S2"
Modified: trunk/test-suite/cases/semantic/00042/00042-sbml-l2v4.xml
===================================================================
--- trunk/test-suite/cases/semantic/00042/00042-sbml-l2v4.xml 2009-03-17 23:40:25 UTC (rev 9411)
+++ trunk/test-suite/cases/semantic/00042/00042-sbml-l2v4.xml 2009-03-17 23:47:48 UTC (rev 9412)
@@ -5,7 +5,7 @@
<compartment id="compartment" name="compartment" spatialDimensions="2" size="1" units="area"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1.5e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.00015" substanceUnits="substance"/>
<species id="S2" name="S2" compartment="compartment" initialAmount="0" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
Modified: trunk/test-suite/cases/semantic/00042/00042-settings.txt
===================================================================
--- trunk/test-suite/cases/semantic/00042/00042-settings.txt 2009-03-17 23:40:25 UTC (rev 9411)
+++ trunk/test-suite/cases/semantic/00042/00042-settings.txt 2009-03-17 23:47:48 UTC (rev 9412)
@@ -2,7 +2,7 @@
duration: 5.0
steps: 50
variables: S1, S2
-absolute: 0.0000000000000000001
+absolute: 1.000000e-007
relative: 0.0001
amount: S1, S2
concentration:
Modified: trunk/test-suite/cases/semantic/00043/00043-model.m
===================================================================
--- trunk/test-suite/cases/semantic/00043/00043-model.m 2009-03-17 23:40:25 UTC (rev 9411)
+++ trunk/test-suite/cases/semantic/00043/00043-model.m 2009-03-17 23:47:48 UTC (rev 9412)
@@ -20,9 +20,9 @@
The initial conditions are as follows:
[{width:30em,margin-left:5em}| |*Value* |*Units* |
-|Initial amount of S1 |$1.0 \x 10^-15$ |mole |
-|Initial amount of S2 |$2.0 \x 10^-15$ |mole |
-|Initial amount of S3 |$1.0 \x 10^-15$ |mole |
+|Initial amount of S1 |$1.0 \x 10^-3$ |mole |
+|Initial amount of S2 |$2.0 \x 10^-3$ |mole |
+|Initial amount of S3 |$1.0 \x 10^-3$ |mole |
|Value of parameter k1 |$ 0.75$ |metre^2^ mole^-1^ second^-1^ |
|Value of parameter k2 |$ 0.25$ |second^-1^ |
|Area of compartment "compartment" |$ 1$ |metre^2^ |]
@@ -37,9 +37,9 @@
newcase[ "00043" ];
addCompartment[ compartment, spatialDimensions-> 2, size -> 1 ];
-addSpecies[ S1, initialAmount -> 1.0 10^-15];
-addSpecies[ S2, initialAmount -> 2.0 10^-15];
-addSpecies[ S3, initialAmount -> 1.0 10^-15];
+addSpecies[ S1, initialAmount -> 1.0 10^-3];
+addSpecies[ S2, initialAmount -> 2.0 10^-3];
+addSpecies[ S3, initialAmount -> 1.0 10^-3];
addParameter[ k1, value -> 0.75 ];
addParameter[ k2, value -> 0.25 ];
addReaction[ S1 + S2 -> S3, reversible -> False,
Modified: trunk/test-suite/cases/semantic/00043/00043-plot.eps
===================================================================
--- trunk/test-suite/cases/semantic/00043/00043-plot.eps 2009-03-17 23:40:25 UTC (rev 9411)
+++ trunk/test-suite/cases/semantic/00043/00043-plot.eps 2009-03-17 23:47:48 UTC (rev 9412)
@@ -2,16 +2,13 @@
%%BoundingBox: 88 4 376 144
%%HiResBoundingBox: 88 4 376 143.563
%%Creator: (Mathematica 5.2 for Microsoft Windows)
-%%CreationDate: (Thursday, February 7, 2008) (11:48:29)
+%%CreationDate: (Tuesday, March 17, 2009) (16:44:53)
%%Title: Clipboard
-%%DocumentNeededResources: font Math1Mono
-%%+ font Courier
+%%DocumentNeededResources: font Courier
%%DocumentSuppliedResources:
-%%DocumentNeededFonts: Math1Mono
-%%+ Courier
+%%DocumentNeededFonts: Courier
%%DocumentSuppliedFonts:
-%%DocumentFonts: Math1Mono
-%%+ Courier
+%%DocumentFonts: Courier
%%EndComments
0 147.563 translate 1 -1 scale
150 dict begin
@@ -1173,11 +1170,11 @@
/Y {0 exch rmoveto} bind def
gsave
newpath
- 143.313 112.563 moveto
- 277.500 112.563 lineto
- 277.500 29.625 lineto
- 143.313 29.625 lineto
- 143.313 112.563 lineto
+ 129.688 116.000 moveto
+ 277.188 116.000 lineto
+ 277.188 24.813 lineto
+ 129.688 24.813 lineto
+ 129.688 116.000 lineto
closepath
clip newpath
grestore
@@ -1410,7 +1407,7 @@
%%IncludeFont: Courier
/Courier findfont 10 scalefont setfont
% Scaling calculations
-0.0238095 0.047619 0.0147151 1.96643e+014 [
+0.0238095 0.047619 0.0147151 197.777 [
[.2619 .00222 -3 -9 ]
[.2619 .00222 3 0 ]
[.5 .00222 -6 -9 ]
@@ -1419,20 +1416,20 @@
[.7381 .00222 6 0 ]
[.97619 .00222 -6 -9 ]
[.97619 .00222 6 0 ]
-[1.025 .01472 0 -6.4375 ]
-[1.025 .01472 28 6.4375 ]
-[.01131 .11304 -37.5 -6.25 ]
-[.01131 .11304 0 6.25 ]
-[.01131 .21136 -37.5 -6.25 ]
-[.01131 .21136 0 6.25 ]
-[.01131 .30968 -49.5 -6.25 ]
-[.01131 .30968 0 6.25 ]
-[.01131 .408 -37.5 -6.25 ]
-[.01131 .408 0 6.25 ]
-[.01131 .50632 -49.5 -6.25 ]
-[.01131 .50632 0 6.25 ]
-[.01131 .60464 -37.5 -6.25 ]
-[.01131 .60464 0 6.25 ]
+[1.025 .01472 0 -6.25 ]
+[1.025 .01472 28 6.25 ]
+[.01131 .1136 -36 -4.5 ]
+[.01131 .1136 0 4.5 ]
+[.01131 .21249 -30 -4.5 ]
+[.01131 .21249 0 4.5 ]
+[.01131 .31138 -36 -4.5 ]
+[.01131 .31138 0 4.5 ]
+[.01131 .41027 -30 -4.5 ]
+[.01131 .41027 0 4.5 ]
+[.01131 .50916 -36 -4.5 ]
+[.01131 .50916 0 4.5 ]
+[.01131 .60805 -30 -4.5 ]
+[.01131 .60805 0 4.5 ]
[ 0 0 0 0 ]
[ 1 .61803 0 0 ]
] MathScale
@@ -1513,10 +1510,10 @@
1 .01472 L
s
gsave
-1.025 .01472 -61 -10.4375 Mabsadd m
+1.025 .01472 -61 -10.25 Mabsadd m
1 1 Mabs scale
currentpoint translate
-0 20.875 translate 1 -1 scale
+0 20.5 translate 1 -1 scale
/g { setgray} bind def
/k { setcmykcolor} bind def
/p { gsave} bind def
@@ -1537,21 +1534,21 @@
/My {currentpoint pop exch moveto} bind def
/X {0 rmoveto} bind def
/Y {0 exch rmoveto} bind def
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
0.000 0.000 rmoveto
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
(Time) show
-87.000 13.000 moveto
+87.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
@@ -1560,174 +1557,102 @@
0.000 0.000 rmoveto
1.000 setlinewidth
grestore
-.02381 .11304 m
-.03006 .11304 L
+.02381 .1136 m
+.03006 .1136 L
s
-gsave
-.01131 .11304 -37.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(5) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-16) show
-grestore
-.02381 .21136 m
-.03006 .21136 L
+[(0.0005)] .01131 .1136 1 0 Mshowa
+.02381 .21249 m
+.03006 .21249 L
s
-gsave
-.01131 .21136 -37.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(1) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
-.02381 .30968 m
-.03006 .30968 L
+[(0.001)] .01131 .21249 1 0 Mshowa
+.02381 .31138 m
+.03006 .31138 L
s
-gsave
-.01131 .30968 -49.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(1.5) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
-.02381 .408 m
-.03006 .408 L
+[(0.0015)] .01131 .31138 1 0 Mshowa
+.02381 .41027 m
+.03006 .41027 L
s
-gsave
-.01131 .408 -37.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(2) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
-.02381 .50632 m
-.03006 .50632 L
+[(0.002)] .01131 .41027 1 0 Mshowa
+.02381 .50916 m
+.03006 .50916 L
s
-gsave
-.01131 .50632 -49.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(2.5) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
-.02381 .60464 m
-.03006 .60464 L
+[(0.0025)] .01131 .50916 1 0 Mshowa
+.02381 .60805 m
+.03006 .60805 L
s
-gsave
-.01131 .60464 -37.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(3) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
+[(0.003)] .01131 .60805 1 0 Mshowa
.125 Mabswid
-.02381 .03438 m
-.02756 .03438 L
+.02381 .03449 m
+.02756 .03449 L
s
-.02381 .05404 m
-.02756 .05404 L
+.02381 .05427 m
+.02756 .05427 L
s
-.02381 .07371 m
-.02756 .07371 L
+.02381 .07405 m
+.02756 .07405 L
s
-.02381 .09337 m
-.02756 .09337 L
+.02381 .09383 m
+.02756 .09383 L
s
-.02381 .1327 m
-.02756 .1327 L
+.02381 .13338 m
+.02756 .13338 L
s
-.02381 .15237 m
-.02756 .15237 L
+.02381 .15316 m
+.02756 .15316 L
s
-.02381 .17203 m
-.02756 .17203 L
+.02381 .17294 m
+.02756 .17294 L
s
-.02381 .19169 m
-.02756 .19169 L
+.02381 .19271 m
+.02756 .19271 L
s
-.02381 .23102 m
-.02756 .23102 L
+.02381 .23227 m
+.02756 .23227 L
s
-.02381 .25069 m
-.02756 .25069 L
+.02381 .25205 m
+.02756 .25205 L
s
-.02381 .27035 m
-.02756 .27035 L
+.02381 .27182 m
+.02756 .27182 L
s
-.02381 .29002 m
-.02756 .29002 L
+.02381 .2916 m
+.02756 .2916 L
s
-.02381 .32934 m
-.02756 .32934 L
+.02381 .33116 m
+.02756 .33116 L
s
-.02381 .34901 m
-.02756 .34901 L
+.02381 .35094 m
+.02756 .35094 L
s
-.02381 .36867 m
-.02756 .36867 L
+.02381 .37071 m
+.02756 .37071 L
s
-.02381 .38834 m
-.02756 .38834 L
+.02381 .39049 m
+.02756 .39049 L
s
-.02381 .42767 m
-.02756 .42767 L
+.02381 .43005 m
+.02756 .43005 L
s
-.02381 .44733 m
-.02756 .44733 L
+.02381 .44982 m
+.02756 .44982 L
s
-.02381 .46699 m
-.02756 .46699 L
+.02381 .4696 m
+.02756 .4696 L
s
-.02381 .48666 m
-.02756 .48666 L
+.02381 .48938 m
+.02756 .48938 L
s
-.02381 .52599 m
-.02756 .52599 L
+.02381 .52893 m
+.02756 .52893 L
s
-.02381 .54565 m
-.02756 .54565 L
+.02381 .54871 m
+.02756 .54871 L
s
-.02381 .56532 m
-.02756 .56532 L
+.02381 .56849 m
+.02756 .56849 L
s
-.02381 .58498 m
-.02756 .58498 L
+.02381 .58827 m
+.02756 .58827 L
s
.25 Mabswid
.02381 0 m
@@ -1742,85 +1667,85 @@
newpath
0 1 0 r
.5 Mabswid
-.02381 .21136 m
-.06244 .24746 L
-.10458 .27932 L
-.14415 .30346 L
-.18221 .32239 L
-.22272 .33879 L
-.26171 .3516 L
-.30316 .36263 L
-.34309 .37121 L
-.3815 .37793 L
-.42237 .38374 L
-.46172 .38827 L
-.49955 .39182 L
-.53984 .39491 L
-.57861 .39732 L
-.61984 .3994 L
-.65954 .40102 L
-.69774 .40228 L
-.73838 .40338 L
-.77751 .40424 L
-.81909 .40498 L
-.85916 .40555 L
-.89771 .406 L
-.93871 .40639 L
-.97619 .40668 L
+.02381 .21249 m
+.06244 .24855 L
+.10458 .2803 L
+.14415 .30431 L
+.18221 .32309 L
+.22272 .33931 L
+.26171 .35196 L
+.30316 .36281 L
+.34309 .37123 L
+.3815 .3778 L
+.42237 .38347 L
+.46172 .38787 L
+.49955 .39132 L
+.53984 .3943 L
+.57861 .39663 L
+.61984 .39862 L
+.65954 .40018 L
+.69774 .40139 L
+.73838 .40243 L
+.77751 .40325 L
+.81909 .40395 L
+.85916 .40449 L
+.89771 .40491 L
+.93871 .40527 L
+.97619 .40554 L
s
0 0 1 r
-.02381 .408 m
-.06244 .4441 L
-.10458 .47596 L
-.14415 .5001 L
-.18221 .51903 L
-.22272 .53544 L
-.26171 .54825 L
-.30316 .55928 L
-.34309 .56786 L
-.3815 .57457 L
-.42237 .58038 L
-.46172 .58491 L
-.49955 .58846 L
-.53984 .59155 L
-.57861 .59396 L
-.61984 .59604 L
-.65954 .59766 L
-.69774 .59893 L
-.73838 .60003 L
-.77751 .60088 L
-.81909 .60162 L
-.85916 .60219 L
-.89771 .60264 L
-.93871 .60303 L
+.02381 .41027 m
+.06244 .44633 L
+.10458 .47808 L
+.14415 .50208 L
+.18221 .52086 L
+.22272 .53709 L
+.26171 .54973 L
+.30316 .56059 L
+.34309 .569 L
+.3815 .57558 L
+.42237 .58124 L
+.46172 .58565 L
+.49955 .5891 L
+.53984 .59208 L
+.57861 .5944 L
+.61984 .5964 L
+.65954 .59795 L
+.69774 .59917 L
+.73838 .60021 L
+.77751 .60103 L
+.81909 .60172 L
+.85916 .60226 L
+.89771 .60269 L
+.93871 .60305 L
.97619 .60332 L
s
1 0 0 r
-.02381 .21136 m
-.06244 .17526 L
-.10458 .1434 L
-.14415 .11926 L
-.18221 .10032 L
-.22272 .08392 L
-.26171 .07111 L
-.30316 .06008 L
-.34309 .0515 L
-.3815 .04478 L
-.42237 .03898 L
-.46172 .03445 L
-.49955 .03089 L
-.53984 .02781 L
-.57861 .0254 L
-.61984 .02332 L
-.65954 .0217 L
-.69774 .02043 L
-.73838 .01933 L
-.77751 .01848 L
-.81909 .01774 L
-.85916 .01716 L
-.89771 .01672 L
-.93871 .01633 L
-.97619 .01604 L
+.02381 .21249 m
+.06244 .17643 L
+.10458 .14468 L
+.14415 .12068 L
+.18221 .1019 L
+.22272 .08567 L
+.26171 .07303 L
+.30316 .06217 L
+.34309 .05376 L
+.3815 .04718 L
+.42237 .04152 L
+.46172 .03711 L
+.49955 .03366 L
+.53984 .03068 L
+.57861 .02836 L
+.61984 .02636 L
+.65954 .02481 L
+.69774 .02359 L
+.73838 .02255 L
+.77751 .02173 L
+.81909 .02104 L
+.85916 .0205 L
+.89771 .02007 L
+.93871 .01971 L
+.97619 .01944 L
s
MathSubEnd
P
@@ -1903,10 +1828,10 @@
% End of sub-graphic
0 g
gsave
-.38988 .36957 -61 -10.4375 Mabsadd m
+.38988 .36957 -61 -10.25 Mabsadd m
1 1 Mabs scale
currentpoint translate
-0 20.875 translate 1 -1 scale
+0 20.5 translate 1 -1 scale
/g { setgray} bind def
/k { setcmykcolor} bind def
/p { gsave} bind def
@@ -1927,21 +1852,21 @@
/My {currentpoint pop exch moveto} bind def
/X {0 rmoveto} bind def
/Y {0 exch rmoveto} bind def
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
0.000 0.000 rmoveto
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
(S3) show
-75.000 13.000 moveto
+75.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
@@ -1984,10 +1909,10 @@
% End of sub-graphic
0 g
gsave
-.38988 1 -61 -10.4375 Mabsadd m
+.38988 1 -61 -10.25 Mabsadd m
1 1 Mabs scale
currentpoint translate
-0 20.875 translate 1 -1 scale
+0 20.5 translate 1 -1 scale
/g { setgray} bind def
/k { setcmykcolor} bind def
/p { gsave} bind def
@@ -2008,21 +1933,21 @@
/My {currentpoint pop exch moveto} bind def
/X {0 rmoveto} bind def
/Y {0 exch rmoveto} bind def
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
0.000 0.000 rmoveto
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
(S2) show
-75.000 13.000 moveto
+75.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
@@ -2065,10 +1990,10 @@
% End of sub-graphic
0 g
gsave
-.38988 1.63043 -61 -10.4375 Mabsadd m
+.38988 1.63043 -61 -10.25 Mabsadd m
1 1 Mabs scale
currentpoint translate
-0 20.875 translate 1 -1 scale
+0 20.5 translate 1 -1 scale
/g { setgray} bind def
/k { setcmykcolor} bind def
/p { gsave} bind def
@@ -2089,21 +2014,21 @@
/My {currentpoint pop exch moveto} bind def
/X {0 rmoveto} bind def
/Y {0 exch rmoveto} bind def
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
0.000 0.000 rmoveto
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
(S1) show
-75.000 13.000 moveto
+75.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
Modified: trunk/test-suite/cases/semantic/00043/00043-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00043/00043-results.csv
===================================================================
--- trunk/test-suite/cases/semantic/00043/00043-results.csv 2009-03-17 23:40:25 UTC (rev 9411)
+++ trunk/test-suite/cases/semantic/00043/00043-results.csv 2009-03-17 23:47:48 UTC (rev 9412)
@@ -1,52 +1,52 @@
time,case00043`S1,case00043`S2,case00043`S3
-0,1.e-15,2.e-15,1.e-15
-0.4,1.095162581970295e-15,2.095162581970295e-15,9.048374180297051e-16
-0.8,1.181269246932559e-15,2.181269246932561e-15,8.187307530674402e-16
-1.2,1.259181780663791e-15,2.259181780663792e-15,7.408182193362089e-16
-1.6,1.329679955414388e-15,2.32967995541439e-15,6.70320044585611e-16
-2.,1.393469341793984e-15,2.393469341793986e-15,6.065306582060158e-16
-2.4,1.45118837214135e-15,2.451188372141352e-15,5.488116278586495e-16
-2.8,1.503414705868531e-15,2.503414705868533e-15,4.965852941314687e-16
-3.2,1.550671044989897e-15,2.550671044989899e-15,4.493289550101025e-16
-3.6,1.593430347266306e-15,2.593430347266309e-15,4.065696527336932e-16
-4.,1.632120578287543e-15,2.632120578287546e-15,3.678794217124564e-16
-4.4,1.667128916312874e-15,2.667128916312877e-15,3.328710836871254e-16
-4.8,1.698805788203211e-15,2.698805788203213e-15,3.01194211796789e-16
-5.2,1.727468207069667e-15,2.727468207069669e-15,2.725317929303327e-16
-5.6,1.753403036523009e-15,2.75340303652301e-15,2.465969634769913e-16
-6.,1.776869841081263e-15,2.776869841081264e-15,2.23130158918737e-16
-6.4,1.798103482039245e-15,2.798103482039247e-15,2.018965179607549e-16
-6.8,1.817316476009517e-15,2.817316476009519e-15,1.826835239904821e-16
-7.2,1.834701114295285e-15,2.834701114295287e-15,1.652988857047143e-16
-7.6,1.850431385078339e-15,2.85043138507834e-15,1.495686149216606e-16
-8.,1.864664718722179e-15,2.86466471872218e-15,1.353352812778207e-16
-8.4,1.877543571805048e-15,2.87754357180505e-15,1.224564281949515e-16
-8.8,1.889196849192371e-15,2.889196849192372e-15,1.108031508076291e-16
-9.2,1.899741156533959e-15,2.89974115653396e-15,1.002588434660412e-16
-9.6,1.909282051768373e-15,2.909282051768375e-15,9.071794823162625e-17
-10.,1.91791500504199e-15,2.917915005041991e-15,8.20849949580096e-17
-10.4,1.925726422641095e-15,2.925726422641097e-15,7.42735773589045e-17
-10.8,1.932794491969552e-15,2.932794491969554e-15,6.720550803044694e-17
-11.2,1.939189938012012e-15,2.939189938012014e-15,6.081006198798752e-17
-11.6,1.944976783350232e-15,2.944976783350234e-15,5.502321664976713e-17
-12.,1.950212937170922e-15,2.950212937170923e-15,4.978706282907787e-17
-12.4,1.954950800874627e-15,2.954950800874628e-15,4.504919912537267e-17
-12.8,1.959237796135239e-15,2.959237796135241e-15,4.076220386476044e-17
-13.2,1.963116834196906e-15,2.963116834196908e-15,3.688316580309241e-17
-13.6,1.96662673360837e-15,2.966626733608371e-15,3.337326639162905e-17
-14.,1.969802619254503e-15,2.969802619254504e-15,3.019738074549547e-17
-14.4,1.972676277926121e-15,2.972676277926123e-15,2.732372207387693e-17
-14.8,1.975276474159989e-15,2.97527647415999e-15,2.472352584000922e-17
-15.2,1.977629230328014e-15,2.977629230328015e-15,2.237076967198413e-17
-15.6,1.979758090600221e-15,2.979758090600222e-15,2.024190939977733e-17
-16.,1.981684361657145e-15,2.981684361657147e-15,1.831563834285265e-17
-16.4,1.983427324775434e-15,2.983427324775435e-15,1.657267522456385e-17
-16.8,1.985004424440355e-15,2.985004424440356e-15,1.499557555964301e-17
-17.2,1.986431442465233e-15,2.986431442465235e-15,1.356855753476429e-17
-17.6,1.987722660691374e-15,2.987722660691375e-15,1.227733930862428e-17
-18.,1.988891003478978e-15,2.98889100347898e-15,1.110899652101933e-17
-18.4,1.989948164932499e-15,2.989948164932501e-15,1.005183506749869e-17
-18.8,1.990904723912498e-15,2.9909047239125e-15,9.095276087499552e-18
-19.2,1.991770253503691e-15,2.991770253503693e-15,8.229746496306983e-18
-19.6,1.992553416936566e-15,2.992553416936568e-15,7.446583063431985e-18
-20.,1.993262053000882e-15,2.993262053000884e-15,6.737946999115285e-18
\ No newline at end of file
+0,0.001,0.002,0.001
+0.4,0.001094548868370728,0.002094548868370727,0.0009054511316292719
+0.8,0.00118001848953847,0.002180018489538469,0.0008199815104615298
+1.2,0.001257276749958873,0.002257276749958871,0.0007427232500411273
+1.6,0.001327109297396784,0.002327109297396782,0.0006728907026032167
+2.,0.001390227209184955,0.002390227209184953,0.0006097727908150456
+2.4,0.001447273964930345,0.002447273964930343,0.0005527260350696556
+2.8,0.001498831750824368,0.002498831750824366,0.0005011682491756331
+3.2,0.001545427271591323,0.002545427271591322,0.0004545727284086771
+3.6,0.001587536949569996,0.002587536949569994,0.0004124630504300042
+4.,0.001625591689598026,0.002625591689598024,0.0003744083104019749
+4.4,0.001659981183772631,0.002659981183772629,0.0003400188162273701
+4.8,0.001691057760349918,0.002691057760349917,0.0003089422396500824
+5.2,0.001719140076169886,0.002719140076169885,0.0002808599238301143
+5.6,0.001744516233233725,0.002744516233233724,0.0002554837667662752
+6.,0.001767446616066154,0.002767446616066153,0.0002325533839338463
+6.4,0.0017881666657187,0.002788166665718698,0.0002118333342813009
+6.8,0.001806889246985867,0.002806889246985865,0.0001931107530141337
+7.2,0.001823806724165519,0.002823806724165518,0.0001761932758344814
+7.6,0.001839092942842859,0.002839092942842857,0.0001609070571571419
+8.,0.00185290508620386,0.002852905086203859,0.00014709491379614
+8.4,0.001865385198822914,0.002865385198822912,0.0001346148011770866
+8.8,0.001876661656975843,0.002876661656975842,0.0001233383430241569
+9.2,0.001886850480279047,0.002886850480279046,0.0001131495197209531
+9.6,0.001896056518122009,0.002896056518122009,0.0001039434818779907
+10.,0.001904374522582393,0.002904374522582392,0.00009562547741760679
+10.4,0.001911890117170247,0.002911890117170246,0.00008810988282975318
+10.8,0.001918680675619498,0.002918680675619496,0.00008131932438050237
+11.2,0.001924816116826219,0.002924816116826218,0.00007518388317378116
+11.6,0.00193035962201589,0.002930359622015888,0.00006964037798411025
+12.,0.001935368283094718,0.002935368283094717,0.00006463171690528209
+12.4,0.00193989368877822,0.002939893688778219,0.00006010631122177972
+12.8,0.001943982454438532,0.002943982454438531,0.000056017545561468
+13.2,0.001947676701050027,0.002947676701050026,0.00005232329894997333
+13.6,0.001951014488103085,0.002951014488103083,0.00004898551189691535
+14.,0.001954030204893596,0.002954030204893595,0.0000459697951064034
+14.4,0.001956754924176747,0.002956754924176745,0.00004324507582325254
+14.8,0.001959216721659568,0.002959216721659566,0.00004078327834043178
+15.2,0.001961440964382299,0.002961440964382297,0.00003855903561770112
+15.6,0.001963450572468844,0.002963450572468842,0.00003654942753115635
+16.,0.001965266255251286,0.002965266255251284,0.00003473374474871375
+16.4,0.001966906724398662,0.00296690672439866,0.00003309327560133805
+16.8,0.0019683888865201,0.002968388886520098,0.00003161111347990038
+17.2,0.001969728017215254,0.002969728017215252,0.00003027198278474602
+17.6,0.001970937918356177,0.002970937918356176,0.00002906208164382243
+18.,0.001972031060213723,0.002972031060213721,0.00002796893978627687
+18.4,0.001973018709886818,0.002973018709886816,0.00002698129011318129
+18.8,0.001973911047352977,0.002973911047352976,0.000026088952647022
+19.2,0.001974717270331516,0.002974717270331515,0.00002528272966848327
+19.6,0.001975445688837711,0.00297544568883771,0.00002455431116228797
+20.,0.001976103810860182,0.00297610381086018,0.00002389618913981748
\ No newline at end of file
Modified: trunk/test-suite/cases/semantic/00043/00043-sbml-l2v1.xml
===================================================================
--- trunk/test-suite/cases/semantic/00043/00043-sbml-l2v1.xml 2009-03-17 23:40:25 UTC (rev 9411)
+++ trunk/test-suite/cases/semantic/00043/00043-sbml-l2v1.xml 2009-03-17 23:47:48 UTC (rev 9412)
@@ -5,9 +5,9 @@
<compartment id="compartment" name="compartment" spatialDimensions="2" size="1" units="area"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1e-015" substanceUnits="substance"/>
- <species id="S2" name="S2" compartment="compartment" initialAmount="2e-015" substanceUnits="substance"/>
- <species id="S3" name="S3" compartment="compartment" initialAmount="1e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.001" substanceUnits="substance"/>
+ <species id="S2" name="S2" compartment="compartment" initialAmount="0.002" substanceUnits="substance"/>
+ <species id="S3" name="S3" compartment="compartment" initialAmount="0.001" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
<parameter id="k1" name="k1" value="0.75"/>
Modified: trunk/test-suite/cases/semantic/00043/00043-sbml-l2v2.xml
===================================================================
--- trunk/test-suite/cases/semantic/00043/00043-sbml-l2v2.xml 2009-03-17 23:40:25 UTC (rev 9411)
+++ trunk/test-suite/cases/semantic/00043/00043-sbml-l2v2.xml 2009-03-17 23:47:48 UTC (rev 9412)
@@ -5,9 +5,9 @@
<compartment id="compartment" name="compartment" spatialDimensions="2" size="1" units="area"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1e-015" substanceUnits="substance"/>
- <species id="S2" name="S2" compartment="compartment" initialAmount="2e-015" substanceUnits="substance"/>
- <species id="S3" name="S3" compartment="compartment" initialAmount="1e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.001" substanceUnits="substance"/>
+ <species id="S2" name="S2" compartment="compartment" initialAmount="0.002" substanceUnits="substance"/>
+ <species id="S3" name="S3" compartment="compartment" initialAmount="0.001" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
<parameter id="k1" name="k1" value="0.75"/>
Modified: trunk/test-suite/cases/semantic/00043/00043-sbml-l2v3.xml
===================================================================
--- trunk/test-suite/cases/semantic/00043/00043-sbml-l2v3.xml 2009-03-17 23:40:25 UTC (rev 9411)
+++ trunk/test-suite/cases/semantic/00043/00043-sbml-l2v3.xml 2009-03-17 23:47:48 UTC (rev 9412)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated 7-February-2008 11:48:28.6406250 -->
-<!-- Generated by MathSBML 2.7.1 (7 December 2007) -->
+<!-- Generated 17-March-2009 16:44:52.2968750 -->
+<!-- Generated by MathSBML 2.7.5 [2-May-2008] -->
<!-- Generated using Mathematica Version 5.2 for Microsoft Windows (June 20, 2005) -->
<sbml xmlns="http://www.sbml.org/sbml/level2/version3"
level="2"
@@ -17,7 +17,7 @@
name="compartment"
spatialDimensions="2"
units="area"
- size="1"/>
+ size="1."/>
</listOfCompartments>
<listOfSpecies>
<species id="S1"
@@ -25,7 +25,7 @@
compartment="compartment"
boundaryCondition="false"
constant="false"
- initialAmount="1.e-15"
+ initialAmount="0.001"
substanceUnits="substance"
hasOnlySubstanceUnits="false"/>
<species id="S2"
@@ -33,7 +33,7 @@
compartment="compartment"
boundaryCondition="false"
constant="false"
- initialAmount="2.e-15"
+ initialAmount="0.002"
substanceUnits="substance"
hasOnlySubstanceUnits="false"/>
<species id="S3"
@@ -41,7 +41,7 @@
compartment="compartment"
boundaryCondition="false"
constant="false"
- initialAmount="1.e-15"
+ initialAmount="0.001"
substanceUnits="substance"
hasOnlySubstanceUnits="false"/>
</listOfSpecies>
Modified: trunk/test-suite/cases/semantic/00043/00043-sbml-l2v4.xml
===================================================================
--- trunk/test-suite/cases/semantic/00043/00043-sbml-l2v4.xml 2009-03-17 23:40:25 UTC (rev 9411)
+++ trunk/test-suite/cases/semantic/00043/00043-sbml-l2v4.xml 2009-03-17 23:47:48 UTC (rev 9412)
@@ -5,9 +5,9 @@
<compartment id="compartment" name="compartment" spatialDimensions="2" size="1" units="area"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1e-015" substanceUnits="substance"/>
- <species id="S2" name="S2" compartment="compartment" initialAmount="2e-015" substanceUnits="substance"/>
- <species id="S3" name="S3" compartment="compartment" initialAmount="1e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.001" substanceUnits="substance"/>
+ <species id="S2" name="S2" compartment="compartment" initialAmount="0.002" substanceUnits="substance"/>
+ <species id="S3" name="S3" compartment="compartment" initialAmount="0.001" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
<parameter id="k1" name="k1" value="0.75"/>
Modified: trunk/test-suite/cases/semantic/00043/00043-settings.txt
===================================================================
--- trunk/test-suite/cases/semantic/00043/00043-settings.txt 2009-03-17 23:40:25 UTC (rev 9411)
+++ trunk/test-suite/cases/semantic/00043/00043-settings.txt 2009-03-17 23:47:48 UTC (rev 9412)
@@ -2,7 +2,7 @@
duration: 20.0
steps: 50
variables: S1, S2, S3
-absolute: 0.0000000000000000001
+absolute: 1.000000e-006
relative: 0.0001
amount: S1, S2, S3
concentration:
Modified: trunk/test-suite/cases/semantic/00044/00044-model.m
===================================================================
--- trunk/test-suite/cases/semantic/00044/00044-model.m 2009-03-17 23:40:25 UTC (rev 9411)
+++ trunk/test-suite/cases/semantic/00044/00044-model.m 2009-03-17 23:47:48 UTC (rev 9412)
@@ -21,12 +21,12 @@
The initial conditions are as follows:
[{width:30em,margin-left:5em}| |*Value* |*Units* |
-|Initial amount of S1 |$1.0 \x 10^-15$ |mole |
-|Initial amount of S2 |$1.0 \x 10^-15$ |mole |
-|Initial amount of S3 |$2.0 \x 10^-15$ |mole |
-|Initial amount of S4 |$1.0 \x 10^-15$ |mole |
-|Value of parameter k1 |$0.75 \x 10^15$ |metre^2^ mole^-1^ second^-1^ |
-|Value of parameter k2 |$0.25 \x 10^15$ |metre^2^ mole^-1^ second^-1^ |
+|Initial amount of S1 |$1.0 \x 10^-2$ |mole |
+|Initial amount of S2 |$1.0 \x 10^-2$ |mole |
+|Initial amount of S3 |$2.0 \x 10^-2$ |mole |
+|Initial amount of S4 |$1.0 \x 10^-2$ |mole |
+|Value of parameter k1 |$0.75 \x 10^2$ |metre^2^ mole^-1^ second^-1^ |
+|Value of parameter k2 |$0.25 \x 10^2$ |metre^2^ mole^-1^ second^-1^ |
|Area of compartment "compartment" |$ 1$ |metre^2^ |]
The species values are given as amounts of substance to make it easier to
@@ -39,12 +39,12 @@
newcase[ "00044" ];
addCompartment[ compartment, spatialDimensions-> 2, size -> 1 ];
-addSpecies[ S1, initialAmount -> 1.0 10^-15];
-addSpecies[ S2, initialAmount -> 1.0 10^-15];
-addSpecies[ S3, initialAmount -> 2.0 10^-15];
-addSpecies[ S4, initialAmount -> 1.0 10^-15];
-addParameter[ k1, value -> 0.75 10^15 ];
-addParameter[ k2, value -> 0.25 10^15 ];
+addSpecies[ S1, initialAmount -> 1.0 10^-2];
+addSpecies[ S2, initialAmount -> 1.0 10^-2];
+addSpecies[ S3, initialAmount -> 2.0 10^-2];
+addSpecies[ S4, initialAmount -> 1.0 10^-2];
+addParameter[ k1, value -> 0.75 10^2 ];
+addParameter[ k2, value -> 0.25 10^2 ];
addReaction[ S1 + S2 -> S3 + S4, reversible -> False,
kineticLaw -> k1 * S1 * S2 * compartment ];
addReaction[ S3 + S4 -> S1 + S2, reversible -> False,
Modified: trunk/test-suite/cases/semantic/00044/00044-plot.eps
===================================================================
--- trunk/test-suite/cases/semantic/00044/00044-plot.eps 2009-03-17 23:40:25 UTC (rev 9411)
+++ trunk/test-suite/cases/semantic/00044/00044-plot.eps 2009-03-17 23:47:48 UTC (rev 9412)
@@ -2,16 +2,13 @@
%%BoundingBox: 88 4 376 144
%%HiResBoundingBox: 88 4 376 143.563
%%Creator: (Mathematica 5.2 for Microsoft Windows)
-%%CreationDate: (Thursday, February 7, 2008) (12:05:12)
+%%CreationDate: (Tuesday, March 17, 2009) (16:44:59)
%%Title: Clipboard
-%%DocumentNeededResources: font Math1Mono
-%%+ font Courier
+%%DocumentNeededResources: font Courier
%%DocumentSuppliedResources:
-%%DocumentNeededFonts: Math1Mono
-%%+ Courier
+%%DocumentNeededFonts: Courier
%%DocumentSuppliedFonts:
-%%DocumentFonts: Math1Mono
-%%+ Courier
+%%DocumentFonts: Courier
%%EndComments
0 147.563 translate 1 -1 scale
150 dict begin
@@ -1173,11 +1170,11 @@
/Y {0 exch rmoveto} bind def
gsave
newpath
- 149.375 109.563 moveto
- 277.625 109.563 lineto
- 277.625 30.313 lineto
- 149.375 30.313 lineto
- 149.375 109.563 lineto
+ 123.625 120.438 moveto
+ 277.000 120.438 lineto
+ 277.000 25.688 lineto
+ 123.625 25.688 lineto
+ 123.625 120.438 lineto
closepath
clip newpath
grestore
@@ -1253,6 +1250,16 @@
grestore
gsave
newpath
+ 308.875 126.625 moveto
+ 362.250 126.625 lineto
+ 362.250 19.875 lineto
+ 308.875 19.875 lineto
+ 308.875 126.625 lineto
+closepath
+clip newpath
+grestore
+gsave
+newpath
311.688 65.313 moveto
327.563 65.313 lineto
327.563 55.500 lineto
@@ -1440,33 +1447,29 @@
%%IncludeFont: Courier
/Courier findfont 10 scalefont setfont
% Scaling calculations
-0.0238095 0.380952 -0.171676 3.43352e+014 [
-[.21429 -0.0125 -9 -9 ]
-[.21429 -0.0125 9 0 ]
-[.40476 -0.0125 -3 -9 ]
-[.40476 -0.0125 3 0 ]
-[.59524 -0.0125 -9 -9 ]
-[.59524 -0.0125 9 0 ]
-[.78571 -0.0125 -3 -9 ]
-[.78571 -0.0125 3 0 ]
-[.97619 -0.0125 -9 -9 ]
-[.97619 -0.0125 9 0 ]
-[1.025 0 0 -6.4375 ]
-[1.025 0 28 6.4375 ]
-[.01131 .08584 -49.5 -6.25 ]
-[.01131 .08584 0 6.25 ]
-[.01131 .17168 -37.5 -6.25 ]
-[.01131 .17168 0 6.25 ]
-[.01131 .25751 -55.5 -6.25 ]
-[.01131 .25751 0 6.25 ]
-[.01131 .34335 -49.5 -6.25 ]
-[.01131 .34335 0 6.25 ]
-[.01131 .42919 -55.5 -6.25 ]
-[.01131 .42919 0 6.25 ]
-[.01131 .51503 -37.5 -6.25 ]
-[.01131 .51503 0 6.25 ]
-[.01131 .60087 -55.5 -6.25 ]
-[.01131 .60087 0 6.25 ]
+0.0238095 0.380952 -0.410587 47.9736 [
+[.21429 .05665 -9 -9 ]
+[.21429 .05665 9 0 ]
+[.40476 .05665 -3 -9 ]
+[.40476 .05665 3 0 ]
+[.59524 .05665 -9 -9 ]
+[.59524 .05665 9 0 ]
+[.78571 .05665 -3 -9 ]
+[.78571 .05665 3 0 ]
+[.97619 .05665 -9 -9 ]
+[.97619 .05665 9 0 ]
+[1.025 .06915 0 -6.25 ]
+[1.025 .06915 28 6.25 ]
+[.01131 .1651 -30 -4.5 ]
+[.01131 .1651 0 4.5 ]
+[.01131 .26104 -30 -4.5 ]
+[.01131 .26104 0 4.5 ]
+[.01131 .35699 -30 -4.5 ]
+[.01131 .35699 0 4.5 ]
+[.01131 .45294 -30 -4.5 ]
+[.01131 .45294 0 4.5 ]
+[.01131 .54888 -24 -4.5 ]
+[.01131 .54888 0 4.5 ]
[ 0 0 0 0 ]
[ 1 .61803 0 0 ]
] MathScale
@@ -1477,96 +1480,96 @@
0 g
.25 Mabswid
[ ] 0 setdash
-.21429 0 m
-.21429 .00625 L
+.21429 .06915 m
+.21429 .0754 L
s
-[(0.5)] .21429 -0.0125 0 1 Mshowa
-.40476 0 m
-.40476 .00625 L
+[(0.5)] .21429 .05665 0 1 Mshowa
+.40476 .06915 m
+.40476 .0754 L
s
-[(1)] .40476 -0.0125 0 1 Mshowa
-.59524 0 m
-.59524 .00625 L
+[(1)] .40476 .05665 0 1 Mshowa
+.59524 .06915 m
+.59524 .0754 L
s
-[(1.5)] .59524 -0.0125 0 1 Mshowa
-.78571 0 m
-.78571 .00625 L
+[(1.5)] .59524 .05665 0 1 Mshowa
+.78571 .06915 m
+.78571 .0754 L
s
-[(2)] .78571 -0.0125 0 1 Mshowa
-.97619 0 m
-.97619 .00625 L
+[(2)] .78571 .05665 0 1 Mshowa
+.97619 .06915 m
+.97619 .0754 L
s
-[(2.5)] .97619 -0.0125 0 1 Mshowa
+[(2.5)] .97619 .05665 0 1 Mshowa
.125 Mabswid
-.0619 0 m
-.0619 .00375 L
+.0619 .06915 m
+.0619 .0729 L
s
-.1 0 m
-.1 .00375 L
+.1 .06915 m
+.1 .0729 L
s
-.1381 0 m
-.1381 .00375 L
+.1381 .06915 m
+.1381 .0729 L
s
-.17619 0 m
-.17619 .00375 L
+.17619 .06915 m
+.17619 .0729 L
s
-.25238 0 m
-.25238 .00375 L
+.25238 .06915 m
+.25238 .0729 L
s
-.29048 0 m
-.29048 .00375 L
+.29048 .06915 m
+.29048 .0729 L
s
-.32857 0 m
-.32857 .00375 L
+.32857 .06915 m
+.32857 .0729 L
s
-.36667 0 m
-.36667 .00375 L
+.36667 .06915 m
+.36667 .0729 L
s
-.44286 0 m
-.44286 .00375 L
+.44286 .06915 m
+.44286 .0729 L
s
-.48095 0 m
-.48095 .00375 L
+.48095 .06915 m
+.48095 .0729 L
s
-.51905 0 m
-.51905 .00375 L
+.51905 .06915 m
+.51905 .0729 L
s
-.55714 0 m
-.55714 .00375 L
+.55714 .06915 m
+.55714 .0729 L
s
-.63333 0 m
-.63333 .00375 L
+.63333 .06915 m
+.63333 .0729 L
s
-.67143 0 m
-.67143 .00375 L
+.67143 .06915 m
+.67143 .0729 L
s
-.70952 0 m
-.70952 .00375 L
+.70952 .06915 m
+.70952 .0729 L
s
-.74762 0 m
-.74762 .00375 L
+.74762 .06915 m
+.74762 .0729 L
s
-.82381 0 m
-.82381 .00375 L
+.82381 .06915 m
+.82381 .0729 L
s
-.8619 0 m
-.8619 .00375 L
+.8619 .06915 m
+.8619 .0729 L
s
-.9 0 m
-.9 .00375 L
+.9 .06915 m
+.9 .0729 L
s
-.9381 0 m
-.9381 .00375 L
+.9381 .06915 m
+.9381 .0729 L
s
.25 Mabswid
-0 0 m
-1 0 L
+0 .06915 m
+1 .06915 L
s
gsave
-1.025 0 -61 -10.4375 Mabsadd m
+1.025 .06915 -61 -10.25 Mabsadd m
1 1 Mabs scale
currentpoint translate
-0 20.875 translate 1 -1 scale
+0 20.5 translate 1 -1 scale
/g { setgray} bind def
/k { setcmykcolor} bind def
/p { gsave} bind def
@@ -1587,212 +1590,107 @@
/My {currentpoint pop exch moveto} bind def
/X {0 rmoveto} bind def
/Y {0 exch rmoveto} bind def
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
+0.000 0.000 rmoveto
+63.000 12.750 moveto
+%%IncludeResource: font Courier
+%%IncludeFont: Courier
+/Courier findfont 10.000 scalefont
+[1 0 0 -1 0 0 ] makefont setfont
+0.000 0.000 0.000 setrgbcolor
(Time) show
+87.000 12.750 moveto
+%%IncludeResource: font Courier
+%%IncludeFont: Courier
+/Courier findfont 10.000 scalefont
+[1 0 0 -1 0 0 ] makefont setfont
+0.000 0.000 0.000 setrgbcolor
+0.000 0.000 rmoveto
1.000 setlinewidth
grestore
-.02381 .08584 m
-.03006 .08584 L
+.02381 .1651 m
+.03006 .1651 L
s
-gsave
-.01131 .08584 -49.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(7.5) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-16) show
-grestore
-.02381 .17168 m
-.03006 .17168 L
+[(0.012)] .01131 .1651 1 0 Mshowa
+.02381 .26104 m
+.03006 .26104 L
s
-gsave
-.01131 .17168 -37.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(1) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
-.02381 .25751 m
-.03006 .25751 L
+[(0.014)] .01131 .26104 1 0 Mshowa
+.02381 .35699 m
+.03006 .35699 L
s
-gsave
-.01131 .25751 -55.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(1.25) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
-.02381 .34335 m
-.03006 .34335 L
+[(0.016)] .01131 .35699 1 0 Mshowa
+.02381 .45294 m
+.03006 .45294 L
s
-gsave
-.01131 .34335 -49.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(1.5) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
-.02381 .42919 m
-.03006 .42919 L
+[(0.018)] .01131 .45294 1 0 Mshowa
+.02381 .54888 m
+.03006 .54888 L
s
-gsave
-.01131 .42919 -55.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(1.75) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
-.02381 .51503 m
-.03006 .51503 L
-s
-gsave
-.01131 .51503 -37.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(2) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
-.02381 .60087 m
-.03006 .60087 L
-s
-gsave
-.01131 .60087 -55.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(2.25) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
+[(0.02)] .01131 .54888 1 0 Mshowa
.125 Mabswid
-.02381 .01717 m
-.02756 .01717 L
+.02381 .09314 m
+.02756 .09314 L
s
-.02381 .03434 m
-.02756 .03434 L
+.02381 .11712 m
+.02756 .11712 L
s
-.02381 .0515 m
-.02756 .0515 L
+.02381 .14111 m
+.02756 .14111 L
s
-.02381 .06867 m
-.02756 .06867 L
+.02381 .18908 m
+.02756 .18908 L
s
-.02381 .10301 m
-.02756 .10301 L
+.02381 .21307 m
+.02756 .21307 L
s
-.02381 .12017 m
-.02756 .12017 L
+.02381 .23706 m
+.02756 .23706 L
s
-.02381 .13734 m
-.02756 .13734 L
+.02381 .28503 m
+.02756 .28503 L
s
-.02381 .15451 m
-.02756 .15451 L
-s
-.02381 .18884 m
-.02756 .18884 L
-s
-.02381 .20601 m
-.02756 .20601 L
-s
-.02381 .22318 m
-.02756 .22318 L
-s
-.02381 .24035 m
-.02756 .24035 L
-s
-.02381 .27468 m
-.02756 .27468 L
-s
-.02381 .29185 m
-.02756 .29185 L
-s
.02381 .30902 m
.02756 .30902 L
s
-.02381 .32618 m
-.02756 .32618 L
+.02381 .333 m
+.02756 .333 L
s
-.02381 .36052 m
-.02756 .36052 L
+.02381 .38098 m
+.02756 .38098 L
s
-.02381 .37769 m
-.02756 .37769 L
+.02381 .40496 m
+.02756 .40496 L
s
-.02381 .39486 m
-.02756 .39486 L
+.02381 .42895 m
+.02756 .42895 L
s
-.02381 .41202 m
-.02756 .41202 L
+.02381 .47692 m
+.02756 .47692 L
s
-.02381 .44636 m
-.02756 .44636 L
+.02381 .50091 m
+.02756 .50091 L
s
-.02381 .46353 m
-.02756 .46353 L
+.02381 .5249 m
+.02756 .5249 L
s
-.02381 .48069 m
-.02756 .48069 L
+.02381 .04516 m
+.02756 .04516 L
s
-.02381 .49786 m
-.02756 .49786 L
+.02381 .02118 m
+.02756 .02118 L
s
-.02381 .5322 m
-.02756 .5322 L
+.02381 .57287 m
+.02756 .57287 L
s
-.02381 .54936 m
-.02756 .54936 L
+.02381 .59686 m
+.02756 .59686 L
s
-.02381 .56653 m
-.02756 .56653 L
-s
-.02381 .5837 m
-.02756 .5837 L
-s
.25 Mabswid
.02381 0 m
.02381 .61803 L
@@ -1806,112 +1704,112 @@
newpath
.5 1 0 r
.5 Mabswid
-.02381 .17168 m
-.06244 .16389 L
-.10458 .15718 L
-.14415 .15221 L
-.18221 .14839 L
-.22272 .14514 L
-.26171 .14265 L
-.30316 .14054 L
-.34309 .13893 L
-.3815 .13768 L
-.42237 .13663 L
-.46172 .13581 L
-.49955 .13519 L
-.53984 .13465 L
-.57861 .13424 L
-.61984 .13388 L
-.65954 .13361 L
-.69774 .13341 L
-.73838 .13323 L
-.77751 .13309 L
-.81909 .13298 L
-.85916 .13289 L
-.89771 .13282 L
-.93871 .13276 L
-.97619 .13272 L
+.02381 .06915 m
+.06244 .05827 L
+.10458 .0489 L
+.14415 .04195 L
+.18221 .03661 L
+.22272 .03207 L
+.26171 .02859 L
+.30316 .02564 L
+.34309 .02339 L
+.3815 .02165 L
+.42237 .02018 L
+.46172 .01904 L
+.49955 .01816 L
+.53984 .01741 L
+.57861 .01684 L
+.61984 .01635 L
+.65954 .01597 L
+.69774 .01568 L
+.73838 .01543 L
+.77751 .01524 L
+.81909 .01508 L
+.85916 .01495 L
+.89771 .01486 L
+.93871 .01477 L
+.97619 .01472 L
s
0 1 1 r
-.02381 .17168 m
-.06244 .16389 L
-.10458 .15718 L
-.14415 .15221 L
-.18221 .14839 L
-.22272 .14514 L
-.26171 .14265 L
-.30316 .14054 L
-.34309 .13893 L
-.3815 .13768 L
-.42237 .13663 L
-.46172 .13581 L
-.49955 .13519 L
-.53984 .13465 L
-.57861 .13424 L
-.61984 .13388 L
-.65954 .13361 L
-.69774 .13341 L
-.73838 .13323 L
-.77751 .13309 L
-.81909 .13298 L
-.85916 .13289 L
-.89771 .13282 L
-.93871 .13276 L
-.97619 .13272 L
+.02381 .06915 m
+.06244 .05827 L
+.10458 .0489 L
+.14415 .04195 L
+.18221 .03661 L
+.22272 .03207 L
+.26171 .02859 L
+.30316 .02564 L
+.34309 .02339 L
+.3815 .02165 L
+.42237 .02018 L
+.46172 .01904 L
+.49955 .01816 L
+.53984 .01741 L
+.57861 .01684 L
+.61984 .01635 L
+.65954 .01597 L
+.69774 .01568 L
+.73838 .01543 L
+.77751 .01524 L
+.81909 .01508 L
+.85916 .01495 L
+.89771 .01486 L
+.93871 .01477 L
+.97619 .01472 L
s
.5 0 1 r
-.02381 .51503 m
-.06244 .52281 L
-.10458 .52952 L
-.14415 .53449 L
-.18221 .53832 L
-.22272 .54156 L
-.26171 .54406 L
-.30316 .54617 L
-.34309 .54778 L
-.3815 .54902 L
-.42237 .55008 L
-.46172 .55089 L
-.49955 .55152 L
-.53984 .55206 L
-.57861 .55247 L
-.61984 .55282 L
-.65954 .55309 L
-.69774 .5533 L
-.73838 .55348 L
-.77751 .55361 L
-.81909 .55373 L
-.85916 .55382 L
-.89771 .55389 L
-.93871 .55394 L
-.97619 .55399 L
+.02381 .54888 m
+.06244 .55976 L
+.10458 .56914 L
+.14415 .57608 L
+.18221 .58142 L
+.22272 .58596 L
+.26171 .58944 L
+.30316 .59239 L
+.34309 .59464 L
+.3815 .59638 L
+.42237 .59786 L
+.46172 .59899 L
+.49955 .59987 L
+.53984 .60062 L
+.57861 .6012 L
+.61984 .60169 L
+.65954 .60207 L
+.69774 .60236 L
+.73838 .6026 L
+.77751 .6028 L
+.81909 .60296 L
+.85916 .60308 L
+.89771 .60318 L
+.93871 .60326 L
+.97619 .60332 L
s
1 0 0 r
-.02381 .17168 m
-.06244 .17946 L
-.10458 .18617 L
-.14415 .19114 L
-.18221 .19496 L
-.22272 .19821 L
-.26171 .2007 L
-.30316 .20281 L
-.34309 .20443 L
-.3815 .20567 L
-.42237 .20673 L
-.46172 .20754 L
-.49955 .20817 L
-.53984 .2087 L
-.57861 .20912 L
-.61984 .20947 L
-.65954 .20974 L
-.69774 .20995 L
-.73838 .21012 L
-.77751 .21026 L
-.81909 .21038 L
-.85916 .21047 L
-.89771 .21053 L
-.93871 .21059 L
-.97619 .21064 L
+.02381 .06915 m
+.06244 .08003 L
+.10458 .0894 L
+.14415 .09635 L
+.18221 .10169 L
+.22272 .10623 L
+.26171 .10971 L
+.30316 .11265 L
+.34309 .11491 L
+.3815 .11664 L
+.42237 .11812 L
+.46172 .11926 L
+.49955 .12013 L
+.53984 .12088 L
+.57861 .12146 L
+.61984 .12195 L
+.65954 .12233 L
+.69774 .12262 L
+.73838 .12287 L
+.77751 .12306 L
+.81909 .12322 L
+.85916 .12335 L
+.89771 .12344 L
+.93871 .12352 L
+.97619 .12358 L
s
MathSubEnd
P
@@ -1994,10 +1892,10 @@
% End of sub-graphic
0 g
gsave
-.38988 .28099 -61 -10.4375 Mabsadd m
+.38988 .28099 -61 -10.25 Mabsadd m
1 1 Mabs scale
currentpoint translate
-0 20.875 translate 1 -1 scale
+0 20.5 translate 1 -1 scale
/g { setgray} bind def
/k { setcmykcolor} bind def
/p { gsave} bind def
@@ -2018,21 +1916,21 @@
/My {currentpoint pop exch moveto} bind def
/X {0 rmoveto} bind def
/Y {0 exch rmoveto} bind def
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
0.000 0.000 rmoveto
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
(S4) show
-75.000 13.000 moveto
+75.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
@@ -2075,10 +1973,10 @@
% End of sub-graphic
0 g
gsave
-.38988 .76033 -61 -10.4375 Mabsadd m
+.38988 .76033 -61 -10.25 Mabsadd m
1 1 Mabs scale
currentpoint translate
-0 20.875 translate 1 -1 scale
+0 20.5 translate 1 -1 scale
/g { setgray} bind def
/k { setcmykcolor} bind def
/p { gsave} bind def
@@ -2099,21 +1997,21 @@
/My {currentpoint pop exch moveto} bind def
/X {0 rmoveto} bind def
/Y {0 exch rmoveto} bind def
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
0.000 0.000 rmoveto
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
(S3) show
-75.000 13.000 moveto
+75.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
@@ -2156,10 +2054,10 @@
% End of sub-graphic
0 g
gsave
-.38988 1.23967 -61 -10.4375 Mabsadd m
+.38988 1.23967 -61 -10.25 Mabsadd m
1 1 Mabs scale
currentpoint translate
-0 20.875 translate 1 -1 scale
+0 20.5 translate 1 -1 scale
/g { setgray} bind def
/k { setcmykcolor} bind def
/p { gsave} bind def
@@ -2180,21 +2078,21 @@
/My {currentpoint pop exch moveto} bind def
/X {0 rmoveto} bind def
/Y {0 exch rmoveto} bind def
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
0.000 0.000 rmoveto
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
(S2) show
-75.000 13.000 moveto
+75.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
@@ -2237,10 +2135,10 @@
% End of sub-graphic
0 g
gsave
-.38988 1.71901 -61 -10.4375 Mabsadd m
+.38988 1.71901 -61 -10.25 Mabsadd m
1 1 Mabs scale
currentpoint translate
-0 20.875 translate 1 -1 scale
+0 20.5 translate 1 -1 scale
/g { setgray} bind def
/k { setcmykcolor} bind def
/p { gsave} bind def
@@ -2261,21 +2159,21 @@
/My {currentpoint pop exch moveto} bind def
/X {0 rmoveto} bind def
/Y {0 exch rmoveto} bind def
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
0.000 0.000 rmoveto
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
(S1) show
-75.000 13.000 moveto
+75.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
Modified: trunk/test-suite/cases/semantic/00044/00044-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00044/00044-results.csv
===================================================================
--- trunk/test-suite/cases/semantic/00044/00044-results.csv 2009-03-17 23:40:25 UTC (rev 9411)
+++ trunk/test-suite/cases/semantic/00044/00044-results.csv 2009-03-17 23:47:48 UTC (rev 9412)
@@ -1,52 +1,52 @@
time,case...
[truncated message content] |
|
From: <sar...@us...> - 2009-03-17 23:40:27
|
Revision: 9411
http://sbml.svn.sourceforge.net/sbml/?rev=9411&view=rev
Author: sarahkeating
Date: 2009-03-17 23:40:25 +0000 (Tue, 17 Mar 2009)
Log Message:
-----------
changes values used so that tolerance does not exceed machine double precision
Modified Paths:
--------------
trunk/test-suite/cases/semantic/00036/00036-model.m
trunk/test-suite/cases/semantic/00036/00036-results.csv
trunk/test-suite/cases/semantic/00036/00036-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00036/00036-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00036/00036-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00036/00036-settings.txt
trunk/test-suite/cases/semantic/00037/00037-model.m
trunk/test-suite/cases/semantic/00037/00037-results.csv
trunk/test-suite/cases/semantic/00037/00037-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00037/00037-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00037/00037-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00037/00037-settings.txt
Modified: trunk/test-suite/cases/semantic/00036/00036-model.m
===================================================================
--- trunk/test-suite/cases/semantic/00036/00036-model.m 2009-03-17 23:35:01 UTC (rev 9410)
+++ trunk/test-suite/cases/semantic/00036/00036-model.m 2009-03-17 23:40:25 UTC (rev 9411)
@@ -29,7 +29,7 @@
[{width:30em,margin-left:5em}| |*Value* |*Units* |
|Initial amount of S1 |$ undeclared$ |mole |
-|Initial amount of S2 |$1.5 \x 10^-15$ |mole |
+|Initial amount of S2 |$1.5 \x 10^-2$ |mole |
|Value of parameter k1 |$ 0.75$ |dimensionless |
|Value of parameter k2 |$ 50$ |second^-1^ |
|Volume of compartment "compartment" |$ 1$ |litre |]
@@ -48,7 +48,7 @@
addCompartment[ compartment, size -> 1];
addSpecies[ S1 ];
-addSpecies[ S2, initialAmount -> 1.5 10^-15 ];
+addSpecies[ S2, initialAmount -> 1.5 10^-2 ];
addParameter[ k1, value -> 0.75 ];
addParameter[ k2, value -> 50 ];
addInitialAssignment[ S1, math -> k1 * S2];
Modified: trunk/test-suite/cases/semantic/00036/00036-results.csv
===================================================================
--- trunk/test-suite/cases/semantic/00036/00036-results.csv 2009-03-17 23:35:01 UTC (rev 9410)
+++ trunk/test-suite/cases/semantic/00036/00036-results.csv 2009-03-17 23:40:25 UTC (rev 9411)
@@ -1,52 +1,52 @@
-time,case00036`S1,case00036`S2
-0,1.125e-015,1.5e-015
-0.004,9.21072e-016,1.70393e-015
-0.008,7.5411e-016,1.87089e-015
-0.012,6.17413e-016,2.00759e-015
-0.016,5.05495e-016,2.1195e-015
-0.02,4.13864e-016,2.21114e-015
-0.024,3.38843e-016,2.28616e-015
-0.028,2.77422e-016,2.34758e-015
-0.032,2.27134e-016,2.39787e-015
-0.036,1.85961e-016,2.43904e-015
-0.04,1.52252e-016,2.47275e-015
-0.044,1.24654e-016,2.50035e-015
-0.048,1.02058e-016,2.52294e-015
-0.052,8.35578e-017,2.54144e-015
-0.056,6.84113e-017,2.55659e-015
-0.06,5.60105e-017,2.56899e-015
-0.064,4.58575e-017,2.57914e-015
-0.068,3.75449e-017,2.58746e-015
-0.072,3.07392e-017,2.59426e-015
-0.076,2.51671e-017,2.59983e-015
-0.08,2.06051e-017,2.60439e-015
-0.084,1.687e-017,2.60813e-015
-0.088,1.3812e-017,2.61119e-015
-0.092,1.13083e-017,2.61369e-015
-0.096,9.25847e-018,2.61574e-015
-0.1,7.58019e-018,2.61742e-015
-0.104,6.20613e-018,2.61879e-015
-0.108,5.08115e-018,2.61992e-015
-0.112,4.1601e-018,2.62084e-015
-0.116,3.406e-018,2.62159e-015
-0.12,2.7886e-018,2.62221e-015
-0.124,2.28311e-018,2.62272e-015
-0.128,1.86925e-018,2.62313e-015
-0.132,1.53041e-018,2.62347e-015
-0.136,1.253e-018,2.62375e-015
-0.14,1.02587e-018,2.62397e-015
-0.144,8.39909e-019,2.62416e-015
-0.148,6.87659e-019,2.62431e-015
-0.152,5.63008e-019,2.62444e-015
-0.156,4.60952e-019,2.62454e-015
-0.16,3.77395e-019,2.62462e-015
-0.164,3.08985e-019,2.62469e-015
-0.168,2.52976e-019,2.62475e-015
-0.172,2.07119e-019,2.62479e-015
-0.176,1.69575e-019,2.62483e-015
-0.18,1.38836e-019,2.62486e-015
-0.184,1.13669e-019,2.62489e-015
-0.188,9.30646e-020,2.62491e-015
-0.192,7.61948e-020,2.62492e-015
-0.196,6.2383e-020,2.62494e-015
-0.2,5.10749e-020,2.62495e-015
\ No newline at end of file
+time,S1,S2
+0,0.01125,0.015
+0.004,0.009210720972127296,0.01703927902787271
+0.008,0.007541100517900942,0.01870889948209906
+0.012,0.006174130906057797,0.0200758690939422
+0.016,0.005054950846318742,0.02119504915368126
+0.02,0.004138643713178726,0.02211135628682127
+0.024,0.003388434884012274,0.02286156511598773
+0.028,0.002774215844343073,0.02347578415565693
+0.032,0.002271335827439873,0.02397866417256013
+0.036,0.001859612492492848,0.02439038750750715
+0.04,0.001522521936411893,0.02472747806358811
+0.044,0.001246535531576256,0.02500346446842374
+0.048,0.001020576974505891,0.02522942302549411
+0.052,0.000835577754911256,0.02541442224508874
+0.056,0.000684113204533702,0.0255658867954663
+0.06,0.0005601045191384694,0.02568989548086153
+0.064,0.0004585747947566199,0.02579142520524338
+0.068,0.0003754492870536683,0.02587455071294633
+0.072,0.0003073918775320412,0.02594260812246796
+0.076,0.000251671183381863,0.02599832881661814
+0.08,0.0002060509374982595,0.02604394906250174
+0.084,0.0001687002392303742,0.02608129976076963
+0.088,0.00013812007390952,0.02611187992609048
+0.092,0.0001130831521271278,0.02613691684787287
+0.096,9.258465430147531e-005,0.02615741534569853
+0.1,7.580190373971149e-005,0.02617419809626029
+0.104,6.206134973355866e-005,0.02618793865026644
+0.108,5.081153560439252e-005,0.02619918846439561
+0.112,4.160096681043297e-005,0.02620839903318957
+0.116,3.40599908854779e-005,0.02621594000911452
+0.12,2.788596198749654e-005,0.0262221140380125
+0.124,2.283109465832701e-005,0.02622716890534167
+0.128,1.869251932320676e-005,0.02623130748067679
+0.132,1.53041404224138e-005,0.02623469585957759
+0.136,1.252997041325403e-005,0.02623747002958675
+0.14,1.02586721124883e-005,0.02623974132788751
+0.144,8.399090344237635e-006,0.02624160090965576
+0.148,6.876593562707694e-006,0.02624312340643729
+0.152,5.630078626206872e-006,0.02624436992137379
+0.156,4.609518513522601e-006,0.02624539048148648
+0.16,3.773954563903258e-006,0.0262462260454361
+0.164,3.0898526621866e-006,0.02624691014733781
+0.168,2.529757397012042e-006,0.02624747024260299
+0.172,2.071190178760264e-006,0.02624792880982124
+0.176,1.695747094824113e-006,0.02624830425290518
+0.18,1.388360295975145e-006,0.02624861163970402
+0.184,1.1366932706673e-006,0.02624886330672933
+0.188,9.30645737512113e-007,0.02624906935426249
+0.192,7.619482855221059e-007,0.02624923805171448
+0.196,6.238304936119908e-007,0.02624937616950639
+0.2,5.107492098279543e-007,0.02624948925079017
Modified: trunk/test-suite/cases/semantic/00036/00036-sbml-l2v2.xml
===================================================================
--- trunk/test-suite/cases/semantic/00036/00036-sbml-l2v2.xml 2009-03-17 23:35:01 UTC (rev 9410)
+++ trunk/test-suite/cases/semantic/00036/00036-sbml-l2v2.xml 2009-03-17 23:40:25 UTC (rev 9411)
@@ -6,7 +6,7 @@
</listOfCompartments>
<listOfSpecies>
<species id="S1" name="S1" compartment="compartment" substanceUnits="substance"/>
- <species id="S2" name="S2" compartment="compartment" initialAmount="1.5e-015" substanceUnits="substance"/>
+ <species id="S2" name="S2" compartment="compartment" initialAmount="0.015" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
<parameter id="k1" name="k1" value="0.75"/>
Modified: trunk/test-suite/cases/semantic/00036/00036-sbml-l2v3.xml
===================================================================
--- trunk/test-suite/cases/semantic/00036/00036-sbml-l2v3.xml 2009-03-17 23:35:01 UTC (rev 9410)
+++ trunk/test-suite/cases/semantic/00036/00036-sbml-l2v3.xml 2009-03-17 23:40:25 UTC (rev 9411)
@@ -32,7 +32,7 @@
compartment="compartment"
boundaryCondition="false"
constant="false"
- initialAmount="1.5000000000000001e-15"
+ initialAmount="1.5e-2"
substanceUnits="substance"
hasOnlySubstanceUnits="false"/>
</listOfSpecies>
Modified: trunk/test-suite/cases/semantic/00036/00036-sbml-l2v4.xml
===================================================================
--- trunk/test-suite/cases/semantic/00036/00036-sbml-l2v4.xml 2009-03-17 23:35:01 UTC (rev 9410)
+++ trunk/test-suite/cases/semantic/00036/00036-sbml-l2v4.xml 2009-03-17 23:40:25 UTC (rev 9411)
@@ -6,7 +6,7 @@
</listOfCompartments>
<listOfSpecies>
<species id="S1" name="S1" compartment="compartment" substanceUnits="substance"/>
- <species id="S2" name="S2" compartment="compartment" initialAmount="1.5e-015" substanceUnits="substance"/>
+ <species id="S2" name="S2" compartment="compartment" initialAmount="0.015" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
<parameter id="k1" name="k1" value="0.75"/>
Modified: trunk/test-suite/cases/semantic/00036/00036-settings.txt
===================================================================
--- trunk/test-suite/cases/semantic/00036/00036-settings.txt 2009-03-17 23:35:01 UTC (rev 9410)
+++ trunk/test-suite/cases/semantic/00036/00036-settings.txt 2009-03-17 23:40:25 UTC (rev 9411)
@@ -2,7 +2,7 @@
duration: 0.2
steps: 50
variables: S1, S2
-absolute: 0.0000000000000000001
+absolute: 1.000000e-005
relative: 0.0001
amount: S1, S2
concentration:
Modified: trunk/test-suite/cases/semantic/00037/00037-model.m
===================================================================
--- trunk/test-suite/cases/semantic/00037/00037-model.m 2009-03-17 23:35:01 UTC (rev 9410)
+++ trunk/test-suite/cases/semantic/00037/00037-model.m 2009-03-17 23:40:25 UTC (rev 9411)
@@ -29,7 +29,7 @@
[{width:30em,margin-left:5em}| |*Value* |*Units* |
|Initial amount of S1 |$ 1$ |mole |
-|Initial amount of S2 |$1.5 \x 10^-15$ |mole |
+|Initial amount of S2 |$1.5 \x 10^-1$ |mole |
|Value of parameter k1 |$ 0.75$ |dimensionless |
|Value of parameter k2 |$ 50$ |second^-1^ |
|Volume of compartment "compartment" |$ $ |litre |]
@@ -48,7 +48,7 @@
addCompartment[ compartment, size -> 1];
addSpecies[ S1, initialAmount->1 ];
-addSpecies[ S2, initialAmount -> 1.5 10^-15 ];
+addSpecies[ S2, initialAmount -> 1.5 10^-1 ];
addParameter[ k1, value -> 0.75 ];
addParameter[ k2, value -> 50 ];
addInitialAssignment[ S1, math -> k1 * S2];
Modified: trunk/test-suite/cases/semantic/00037/00037-results.csv
===================================================================
--- trunk/test-suite/cases/semantic/00037/00037-results.csv 2009-03-17 23:35:01 UTC (rev 9410)
+++ trunk/test-suite/cases/semantic/00037/00037-results.csv 2009-03-17 23:40:25 UTC (rev 9411)
@@ -1,52 +1,52 @@
-time,case00037`S1,case00037`S2
-0,1.125e-015,1.5e-015
-0.004,9.21072e-016,1.70393e-015
-0.008,7.5411e-016,1.87089e-015
-0.012,6.17413e-016,2.00759e-015
-0.016,5.05495e-016,2.1195e-015
-0.02,4.13864e-016,2.21114e-015
-0.024,3.38843e-016,2.28616e-015
-0.028,2.77422e-016,2.34758e-015
-0.032,2.27134e-016,2.39787e-015
-0.036,1.85961e-016,2.43904e-015
-0.04,1.52252e-016,2.47275e-015
-0.044,1.24654e-016,2.50035e-015
-0.048,1.02058e-016,2.52294e-015
-0.052,8.35578e-017,2.54144e-015
-0.056,6.84113e-017,2.55659e-015
-0.06,5.60105e-017,2.56899e-015
-0.064,4.58575e-017,2.57914e-015
-0.068,3.75449e-017,2.58746e-015
-0.072,3.07392e-017,2.59426e-015
-0.076,2.51671e-017,2.59983e-015
-0.08,2.06051e-017,2.60439e-015
-0.084,1.687e-017,2.60813e-015
-0.088,1.3812e-017,2.61119e-015
-0.092,1.13083e-017,2.61369e-015
-0.096,9.25847e-018,2.61574e-015
-0.1,7.58019e-018,2.61742e-015
-0.104,6.20613e-018,2.61879e-015
-0.108,5.08115e-018,2.61992e-015
-0.112,4.1601e-018,2.62084e-015
-0.116,3.406e-018,2.62159e-015
-0.12,2.7886e-018,2.62221e-015
-0.124,2.28311e-018,2.62272e-015
-0.128,1.86925e-018,2.62313e-015
-0.132,1.53041e-018,2.62347e-015
-0.136,1.253e-018,2.62375e-015
-0.14,1.02587e-018,2.62397e-015
-0.144,8.39909e-019,2.62416e-015
-0.148,6.87659e-019,2.62431e-015
-0.152,5.63008e-019,2.62444e-015
-0.156,4.60952e-019,2.62454e-015
-0.16,3.77395e-019,2.62462e-015
-0.164,3.08985e-019,2.62469e-015
-0.168,2.52976e-019,2.62475e-015
-0.172,2.07119e-019,2.62479e-015
-0.176,1.69575e-019,2.62483e-015
-0.18,1.38836e-019,2.62486e-015
-0.184,1.13669e-019,2.62489e-015
-0.188,9.30646e-020,2.62491e-015
-0.192,7.61948e-020,2.62492e-015
-0.196,6.2383e-020,2.62494e-015
-0.2,5.10749e-020,2.62495e-015
\ No newline at end of file
+time,S1,S2
+0,0.1125,0.15
+0.004,0.09210720972127295,0.170392790278727
+0.008,0.07541100517900942,0.1870889948209906
+0.012,0.06174130906057797,0.200758690939422
+0.016,0.05054950846318743,0.2119504915368126
+0.02,0.04138643713178726,0.2211135628682127
+0.024,0.03388434884012274,0.2286156511598773
+0.028,0.02774215844343073,0.2347578415565693
+0.032,0.02271335827439873,0.2397866417256013
+0.036,0.01859612492492848,0.2439038750750715
+0.04,0.01522521936411893,0.2472747806358811
+0.044,0.01246535531576256,0.2500346446842374
+0.048,0.01020576974505891,0.2522942302549411
+0.052,0.008355777549112559,0.2541442224508874
+0.056,0.00684113204533702,0.255658867954663
+0.06,0.005601045191384694,0.2568989548086153
+0.064,0.004585747947566199,0.2579142520524338
+0.068,0.003754492870536683,0.2587455071294633
+0.072,0.003073918775320412,0.2594260812246796
+0.076,0.00251671183381863,0.2599832881661814
+0.08,0.002060509374982595,0.2604394906250174
+0.084,0.001687002392303742,0.2608129976076963
+0.088,0.0013812007390952,0.2611187992609048
+0.092,0.001130831521271278,0.2613691684787287
+0.096,0.0009258465430147532,0.2615741534569853
+0.1,0.0007580190373971149,0.2617419809626029
+0.104,0.0006206134973355866,0.2618793865026644
+0.108,0.0005081153560439252,0.2619918846439561
+0.112,0.0004160096681043297,0.2620839903318957
+0.116,0.0003405999088547791,0.2621594000911452
+0.12,0.0002788596198749654,0.2622211403801251
+0.124,0.0002283109465832701,0.2622716890534168
+0.128,0.0001869251932320676,0.2623130748067679
+0.132,0.000153041404224138,0.2623469585957758
+0.136,0.0001252997041325403,0.2623747002958675
+0.14,0.000102586721124883,0.2623974132788751
+0.144,8.399090344237636e-005,0.2624160090965576
+0.148,6.876593562707694e-005,0.2624312340643729
+0.152,5.630078626206871e-005,0.262443699213738
+0.156,4.6095185135226e-005,0.2624539048148648
+0.16,3.773954563903258e-005,0.2624622604543609
+0.164,3.0898526621866e-005,0.2624691014733782
+0.168,2.529757397012042e-005,0.2624747024260299
+0.172,2.071190178760264e-005,0.2624792880982124
+0.176,1.695747094824113e-005,0.2624830425290518
+0.18,1.388360295975145e-005,0.2624861163970402
+0.184,1.1366932706673e-005,0.2624886330672933
+0.188,9.30645737512113e-006,0.2624906935426249
+0.192,7.619482855221059e-006,0.2624923805171448
+0.196,6.238304936119908e-006,0.2624937616950639
+0.2,5.107492098279543e-006,0.2624948925079017
Modified: trunk/test-suite/cases/semantic/00037/00037-sbml-l2v2.xml
===================================================================
--- trunk/test-suite/cases/semantic/00037/00037-sbml-l2v2.xml 2009-03-17 23:35:01 UTC (rev 9410)
+++ trunk/test-suite/cases/semantic/00037/00037-sbml-l2v2.xml 2009-03-17 23:40:25 UTC (rev 9411)
@@ -6,7 +6,7 @@
</listOfCompartments>
<listOfSpecies>
<species id="S1" name="S1" compartment="compartment" initialAmount="1" substanceUnits="substance"/>
- <species id="S2" name="S2" compartment="compartment" initialAmount="1.5e-015" substanceUnits="substance"/>
+ <species id="S2" name="S2" compartment="compartment" initialAmount="0.15" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
<parameter id="k1" name="k1" value="0.75"/>
Modified: trunk/test-suite/cases/semantic/00037/00037-sbml-l2v3.xml
===================================================================
--- trunk/test-suite/cases/semantic/00037/00037-sbml-l2v3.xml 2009-03-17 23:35:01 UTC (rev 9410)
+++ trunk/test-suite/cases/semantic/00037/00037-sbml-l2v3.xml 2009-03-17 23:40:25 UTC (rev 9411)
@@ -33,7 +33,7 @@
compartment="compartment"
boundaryCondition="false"
constant="false"
- initialAmount="1.5000000000000001e-15"
+ initialAmount="1.5e-1"
substanceUnits="substance"
hasOnlySubstanceUnits="false"/>
</listOfSpecies>
Modified: trunk/test-suite/cases/semantic/00037/00037-sbml-l2v4.xml
===================================================================
--- trunk/test-suite/cases/semantic/00037/00037-sbml-l2v4.xml 2009-03-17 23:35:01 UTC (rev 9410)
+++ trunk/test-suite/cases/semantic/00037/00037-sbml-l2v4.xml 2009-03-17 23:40:25 UTC (rev 9411)
@@ -6,7 +6,7 @@
</listOfCompartments>
<listOfSpecies>
<species id="S1" name="S1" compartment="compartment" initialAmount="1" substanceUnits="substance"/>
- <species id="S2" name="S2" compartment="compartment" initialAmount="1.5e-015" substanceUnits="substance"/>
+ <species id="S2" name="S2" compartment="compartment" initialAmount="0.15" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
<parameter id="k1" name="k1" value="0.75"/>
Modified: trunk/test-suite/cases/semantic/00037/00037-settings.txt
===================================================================
--- trunk/test-suite/cases/semantic/00037/00037-settings.txt 2009-03-17 23:35:01 UTC (rev 9410)
+++ trunk/test-suite/cases/semantic/00037/00037-settings.txt 2009-03-17 23:40:25 UTC (rev 9411)
@@ -2,7 +2,7 @@
duration: 0.2
steps: 50
variables: S1, S2
-absolute: 0.0000000000000000001
+absolute: 1.000000e-004
relative: 0.0001
amount: S1, S2
concentration:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sar...@us...> - 2009-03-17 23:35:15
|
Revision: 9410
http://sbml.svn.sourceforge.net/sbml/?rev=9410&view=rev
Author: sarahkeating
Date: 2009-03-17 23:35:01 +0000 (Tue, 17 Mar 2009)
Log Message:
-----------
changes values used so that tolerance does not exceed machine double precision
Modified Paths:
--------------
trunk/test-suite/cases/semantic/00033/00033-model.m
trunk/test-suite/cases/semantic/00033/00033-plot.eps
trunk/test-suite/cases/semantic/00033/00033-plot.jpg
trunk/test-suite/cases/semantic/00033/00033-results.csv
trunk/test-suite/cases/semantic/00033/00033-sbml-l1v2.xml
trunk/test-suite/cases/semantic/00033/00033-sbml-l2v1.xml
trunk/test-suite/cases/semantic/00033/00033-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00033/00033-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00033/00033-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00033/00033-settings.txt
trunk/test-suite/cases/semantic/00034/00034-model.m
trunk/test-suite/cases/semantic/00034/00034-plot.eps
trunk/test-suite/cases/semantic/00034/00034-plot.jpg
trunk/test-suite/cases/semantic/00034/00034-results.csv
trunk/test-suite/cases/semantic/00034/00034-sbml-l2v1.xml
trunk/test-suite/cases/semantic/00034/00034-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00034/00034-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00034/00034-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00034/00034-settings.txt
trunk/test-suite/cases/semantic/00035/00035-model.m
trunk/test-suite/cases/semantic/00035/00035-plot.eps
trunk/test-suite/cases/semantic/00035/00035-plot.jpg
trunk/test-suite/cases/semantic/00035/00035-results.csv
trunk/test-suite/cases/semantic/00035/00035-sbml-l2v1.xml
trunk/test-suite/cases/semantic/00035/00035-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00035/00035-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00035/00035-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00035/00035-settings.txt
Modified: trunk/test-suite/cases/semantic/00033/00033-model.m
===================================================================
--- trunk/test-suite/cases/semantic/00033/00033-model.m 2009-03-17 23:21:56 UTC (rev 9409)
+++ trunk/test-suite/cases/semantic/00033/00033-model.m 2009-03-17 23:35:01 UTC (rev 9410)
@@ -24,7 +24,7 @@
The initial conditions are as follows:
[{width:30em,margin-left:5em}| |*Value* |*Units* |
-|Initial amount of S1 |$1.5 \x 10^-15$ |mole |
+|Initial amount of S1 |$1.5 \x 10^-1$ |mole |
|Initial amount of S2 |$ 0$ |mole |
|Value of parameter k1 |$ 1$ |second^-1^ |
|Volume of compartment "compartment" |$ 1$ |litre |]
@@ -39,7 +39,7 @@
newcase[ "00033" ];
addCompartment[ compartment, size -> 1 ];
-addSpecies[ S1, initialAmount -> 1.5 10^-15 ];
+addSpecies[ S1, initialAmount -> 1.5 10^-1 ];
addSpecies[ S2, initialAmount -> 0 ];
addParameter[ k1, value -> 1, constant->False ];
addRule[ type->RateRule, variable -> k1, math -> 0.5];
Modified: trunk/test-suite/cases/semantic/00033/00033-plot.eps
===================================================================
--- trunk/test-suite/cases/semantic/00033/00033-plot.eps 2009-03-17 23:21:56 UTC (rev 9409)
+++ trunk/test-suite/cases/semantic/00033/00033-plot.eps 2009-03-17 23:35:01 UTC (rev 9410)
@@ -2,16 +2,13 @@
%%BoundingBox: 88 4 376 144
%%HiResBoundingBox: 88 4 376 143.563
%%Creator: (Mathematica 5.2 for Microsoft Windows)
-%%CreationDate: (Wednesday, February 6, 2008) (14:54:06)
+%%CreationDate: (Tuesday, March 17, 2009) (16:26:52)
%%Title: Clipboard
-%%DocumentNeededResources: font Math1Mono
-%%+ font Courier
+%%DocumentNeededResources: font Courier
%%DocumentSuppliedResources:
-%%DocumentNeededFonts: Math1Mono
-%%+ Courier
+%%DocumentNeededFonts: Courier
%%DocumentSuppliedFonts:
-%%DocumentFonts: Math1Mono
-%%+ Courier
+%%DocumentFonts: Courier
%%EndComments
0 147.563 translate 1 -1 scale
150 dict begin
@@ -1173,11 +1170,11 @@
/Y {0 exch rmoveto} bind def
gsave
newpath
- 143.313 110.313 moveto
- 277.500 110.313 lineto
- 277.500 27.438 lineto
- 143.313 27.438 lineto
- 143.313 110.313 lineto
+ 117.563 118.125 moveto
+ 276.875 118.125 lineto
+ 276.875 19.688 lineto
+ 117.563 19.688 lineto
+ 117.563 118.125 lineto
closepath
clip newpath
grestore
@@ -1380,7 +1377,7 @@
%%IncludeFont: Courier
/Courier findfont 10 scalefont setfont
% Scaling calculations
-0.0238095 0.31746 0.0147151 3.92403e+014 [
+0.0238095 0.31746 0.0147151 3.92403 [
[.18254 .00222 -9 -9 ]
[.18254 .00222 9 0 ]
[.34127 .00222 -3 -9 ]
@@ -1393,22 +1390,22 @@
[.81746 .00222 9 0 ]
[.97619 .00222 -3 -9 ]
[.97619 .00222 3 0 ]
-[1.025 .01472 0 -6.4375 ]
-[1.025 .01472 28 6.4375 ]
-[.01131 .0932 -37.5 -6.25 ]
-[.01131 .0932 0 6.25 ]
-[.01131 .17168 -37.5 -6.25 ]
-[.01131 .17168 0 6.25 ]
-[.01131 .25016 -37.5 -6.25 ]
-[.01131 .25016 0 6.25 ]
-[.01131 .32864 -37.5 -6.25 ]
-[.01131 .32864 0 6.25 ]
-[.01131 .40712 -37.5 -6.25 ]
-[.01131 .40712 0 6.25 ]
-[.01131 .4856 -49.5 -6.25 ]
-[.01131 .4856 0 6.25 ]
-[.01131 .56408 -49.5 -6.25 ]
-[.01131 .56408 0 6.25 ]
+[1.025 .01472 0 -6.25 ]
+[1.025 .01472 28 6.25 ]
+[.01131 .0932 -24 -4.5 ]
+[.01131 .0932 0 4.5 ]
+[.01131 .17168 -24 -4.5 ]
+[.01131 .17168 0 4.5 ]
+[.01131 .25016 -24 -4.5 ]
+[.01131 .25016 0 4.5 ]
+[.01131 .32864 -24 -4.5 ]
+[.01131 .32864 0 4.5 ]
+[.01131 .40712 -18 -4.5 ]
+[.01131 .40712 0 4.5 ]
+[.01131 .4856 -24 -4.5 ]
+[.01131 .4856 0 4.5 ]
+[.01131 .56408 -24 -4.5 ]
+[.01131 .56408 0 4.5 ]
[ 0 0 0 0 ]
[ 1 .61803 0 0 ]
] MathScale
@@ -1521,10 +1518,10 @@
1 .01472 L
s
gsave
-1.025 .01472 -61 -10.4375 Mabsadd m
+1.025 .01472 -61 -10.25 Mabsadd m
1 1 Mabs scale
currentpoint translate
-0 20.875 translate 1 -1 scale
+0 20.5 translate 1 -1 scale
/g { setgray} bind def
/k { setcmykcolor} bind def
/p { gsave} bind def
@@ -1545,21 +1542,21 @@
/My {currentpoint pop exch moveto} bind def
/X {0 rmoveto} bind def
/Y {0 exch rmoveto} bind def
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
0.000 0.000 rmoveto
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
(Time) show
-87.000 13.000 moveto
+87.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
@@ -1571,115 +1568,31 @@
.02381 .0932 m
.03006 .0932 L
s
-gsave
-.01131 .0932 -37.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(2) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-16) show
-grestore
+[(0.02)] .01131 .0932 1 0 Mshowa
.02381 .17168 m
.03006 .17168 L
s
-gsave
-.01131 .17168 -37.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(4) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-16) show
-grestore
+[(0.04)] .01131 .17168 1 0 Mshowa
.02381 .25016 m
.03006 .25016 L
s
-gsave
-.01131 .25016 -37.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(6) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-16) show
-grestore
+[(0.06)] .01131 .25016 1 0 Mshowa
.02381 .32864 m
.03006 .32864 L
s
-gsave
-.01131 .32864 -37.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(8) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-16) show
-grestore
+[(0.08)] .01131 .32864 1 0 Mshowa
.02381 .40712 m
.03006 .40712 L
s
-gsave
-.01131 .40712 -37.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(1) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
+[(0.1)] .01131 .40712 1 0 Mshowa
.02381 .4856 m
.03006 .4856 L
s
-gsave
-.01131 .4856 -49.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(1.2) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
+[(0.12)] .01131 .4856 1 0 Mshowa
.02381 .56408 m
.03006 .56408 L
s
-gsave
-.01131 .56408 -49.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(1.4) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
+[(0.14)] .01131 .56408 1 0 Mshowa
.125 Mabswid
.02381 .03434 m
.02756 .03434 L
@@ -1897,10 +1810,10 @@
% End of sub-graphic
0 g
gsave
-.38988 .53968 -61 -10.4375 Mabsadd m
+.38988 .53968 -61 -10.25 Mabsadd m
1 1 Mabs scale
currentpoint translate
-0 20.875 translate 1 -1 scale
+0 20.5 translate 1 -1 scale
/g { setgray} bind def
/k { setcmykcolor} bind def
/p { gsave} bind def
@@ -1921,21 +1834,21 @@
/My {currentpoint pop exch moveto} bind def
/X {0 rmoveto} bind def
/Y {0 exch rmoveto} bind def
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
0.000 0.000 rmoveto
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
(S2) show
-75.000 13.000 moveto
+75.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
@@ -1978,10 +1891,10 @@
% End of sub-graphic
0 g
gsave
-.38988 1.46032 -61 -10.4375 Mabsadd m
+.38988 1.46032 -61 -10.25 Mabsadd m
1 1 Mabs scale
currentpoint translate
-0 20.875 translate 1 -1 scale
+0 20.5 translate 1 -1 scale
/g { setgray} bind def
/k { setcmykcolor} bind def
/p { gsave} bind def
@@ -2002,21 +1915,21 @@
/My {currentpoint pop exch moveto} bind def
/X {0 rmoveto} bind def
/Y {0 exch rmoveto} bind def
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
0.000 0.000 rmoveto
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
(S1) show
-75.000 13.000 moveto
+75.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
Modified: trunk/test-suite/cases/semantic/00033/00033-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00033/00033-results.csv
===================================================================
--- trunk/test-suite/cases/semantic/00033/00033-results.csv 2009-03-17 23:21:56 UTC (rev 9409)
+++ trunk/test-suite/cases/semantic/00033/00033-results.csv 2009-03-17 23:35:01 UTC (rev 9410)
@@ -1,52 +1,52 @@
time,case00033`S1,case00033`S2
-0,1.5e-15,0
-0.06,1.411375990207194e-15,8.862400979280581e-17
-0.12,1.325599895314872e-15,1.744001046851275e-16
-0.18,1.24279777485835e-15,2.572022251416492e-16
-0.24,1.163072381600015e-15,3.369276183999846e-16
-0.3,1.086503898654373e-15,4.134961013456257e-16
-0.36,1.013150835256103e-15,4.868491647438965e-16
-0.42,9.430510221820423e-16,5.569489778179571e-16
-0.48,8.762227980148421e-16,6.237772019851574e-16
-0.54,8.126661533036569e-16,6.873338466963426e-16
-0.6,7.523641058180989e-16,7.476358941819006e-16
-0.66,6.952839989850691e-16,8.047160010149305e-16
-0.72,6.413788982767541e-16,8.586211017232454e-16
-0.78,5.905890285656614e-16,9.09410971434338e-16
-0.84,5.428431342057119e-16,9.571568657942876e-16
-0.9,4.980599184216897e-16,1.00194008157831e-15
-0.96,4.561494035505093e-16,1.04385059644949e-15
-1.02,4.170142477247018e-16,1.082985752275298e-15
-1.08,3.805510718714698e-16,1.11944892812853e-15
-1.14,3.466516516610491e-16,1.15334834833895e-15
-1.2,3.152041070625597e-16,1.18479589293744e-15
-1.26,2.860939886320337e-16,1.213906011367966e-15
-1.32,2.592052935926022e-16,1.240794706407398e-15
-1.38,2.344214079693094e-16,1.265578592030691e-15
-1.44,2.11625960089723e-16,1.288374039910277e-15
-1.5,1.907035962348278e-16,1.309296403765172e-15
-1.56,1.715406683326114e-16,1.328459331667389e-15
-1.62,1.54025840194093e-16,1.345974159805907e-15
-1.68,1.380506139623507e-16,1.361949386037649e-15
-1.74,1.235097827732005e-16,1.376490217226799e-15
-1.8,1.10301810319335e-16,1.389698189680665e-15
-1.86,9.832913010086641e-17,1.401670869899133e-15
-1.92,8.749838479161012e-17,1.41250161520839e-15
-1.98,7.772060159361773e-17,1.422279398406382e-15
-2.04,6.891131493367748e-17,1.431088685066322e-15
-2.1,6.099063680827412e-17,1.439009363191725e-15
-2.16,5.388328391849787e-17,1.446116716081502e-15
-2.22,4.751855424287839e-17,1.452481445757121e-15
-2.28,4.183027017853525e-17,1.458169729821464e-15
-2.34,3.675669148291014e-17,1.463243308517089e-15
-2.4,3.224040199455608e-17,1.467759598005443e-15
-2.46,2.822816653437088e-17,1.471771833465629e-15
-2.52,2.467079785454765e-17,1.475329202145452e-15
-2.58,2.152296230092733e-17,1.478477037699072e-15
-2.64,1.87429991122649e-17,1.481257000887735e-15
-2.7,1.629274993881593e-17,1.483707250061184e-15
-2.76,1.413735156225096e-17,1.485862648437749e-15
-2.82,1.224503246675545e-17,1.487754967533244e-15
-2.88,1.058693041580976e-17,1.48941306958419e-15
-2.94,9.136892896678059e-18,1.490863107103322e-15
-3.,7.871277598830478e-18,1.49212872240117e-15
\ No newline at end of file
+0,0.15,0
+0.06,0.1411375990245739,0.00886240097542614
+0.12,0.1325599895248442,0.01744001047515582
+0.18,0.1242797775603146,0.02572022243968537
+0.24,0.1163072381446205,0.03369276185537946
+0.3,0.1086503897898159,0.04134961021018401
+0.36,0.1013150834557676,0.04868491654423239
+0.42,0.09430510270748233,0.05569489729251767
+0.48,0.08762227917625511,0.0623777208237449
+0.54,0.08126661558771934,0.06873338441228067
+0.6,0.0752364107004801,0.07476358929951991
+0.66,0.06952839945833072,0.08047160054166929
+0.72,0.0641378901949831,0.08586210980501692
+0.78,0.05905890273243494,0.09094109726756506
+0.84,0.05428431325875888,0.09571568674124113
+0.9,0.04980599205678643,0.1001940079432135
+0.96,0.04561493999519868,0.1043850600048013
+1.02,0.04170142500329206,0.1082985749967079
+1.08,0.03805510703735506,0.1119448929626449
+1.14,0.03466516519802469,0.1153348348019753
+1.2,0.03152041071195981,0.1184795892880402
+1.26,0.02860939884438689,0.1213906011556131
+1.32,0.02592052932530702,0.124079470674693
+1.38,0.02344214074828227,0.1265578592517177
+1.44,0.02116259612613519,0.1288374038738648
+1.5,0.01907035992265364,0.1309296400773463
+1.56,0.01715406706866901,0.132845932931331
+1.62,0.01540258388941347,0.1345974161105865
+1.68,0.01380506096155368,0.1361949390384463
+1.74,0.01235097791085119,0.1376490220891488
+1.8,0.01103018090604092,0.138969819093959
+1.86,0.009832913196997807,0.1401670868030021
+1.92,0.008749838777304768,0.1412501612226952
+1.98,0.007772060331038365,0.1422279396689616
+2.04,0.006891131318671611,0.1431088686813283
+2.1,0.006099063386208345,0.1439009366137916
+2.16,0.005388328206977112,0.1446116717930228
+2.22,0.004751855444914028,0.1452481445550859
+2.28,0.004183027217103266,0.1458169727828966
+2.34,0.003675669393462081,0.1463243306065378
+2.4,0.003224040087621936,0.146775959912378
+2.46,0.002822816573929963,0.14717718342607
+2.52,0.002467079911008414,0.1475329200889915
+2.58,0.002152296219593746,0.1478477037804061
+2.64,0.001874299805437468,0.1481257001945624
+2.7,0.00162927505946424,0.1483707249405356
+2.76,0.001413735220012804,0.1485862647799871
+2.82,0.001224503176262308,0.1487754968237376
+2.88,0.00105869309830174,0.1489413069016981
+2.94,0.0009136892566133247,0.1490863107433866
+3.,0.0007871277598822648,0.1492128722401176
\ No newline at end of file
Modified: trunk/test-suite/cases/semantic/00033/00033-sbml-l1v2.xml
===================================================================
--- trunk/test-suite/cases/semantic/00033/00033-sbml-l1v2.xml 2009-03-17 23:21:56 UTC (rev 9409)
+++ trunk/test-suite/cases/semantic/00033/00033-sbml-l1v2.xml 2009-03-17 23:35:01 UTC (rev 9410)
@@ -5,7 +5,7 @@
<compartment name="compartment" volume="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species name="S1" compartment="compartment" initialAmount="1.5e-015" units="substance"/>
+ <species name="S1" compartment="compartment" initialAmount="0.15" units="substance"/>
<species name="S2" compartment="compartment" initialAmount="0" units="substance"/>
</listOfSpecies>
<listOfParameters>
Modified: trunk/test-suite/cases/semantic/00033/00033-sbml-l2v1.xml
===================================================================
--- trunk/test-suite/cases/semantic/00033/00033-sbml-l2v1.xml 2009-03-17 23:21:56 UTC (rev 9409)
+++ trunk/test-suite/cases/semantic/00033/00033-sbml-l2v1.xml 2009-03-17 23:35:01 UTC (rev 9410)
@@ -5,7 +5,7 @@
<compartment id="compartment" name="compartment" size="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1.5e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.15" substanceUnits="substance"/>
<species id="S2" name="S2" compartment="compartment" initialAmount="0" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
Modified: trunk/test-suite/cases/semantic/00033/00033-sbml-l2v2.xml
===================================================================
--- trunk/test-suite/cases/semantic/00033/00033-sbml-l2v2.xml 2009-03-17 23:21:56 UTC (rev 9409)
+++ trunk/test-suite/cases/semantic/00033/00033-sbml-l2v2.xml 2009-03-17 23:35:01 UTC (rev 9410)
@@ -5,7 +5,7 @@
<compartment id="compartment" name="compartment" size="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1.5e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.15" substanceUnits="substance"/>
<species id="S2" name="S2" compartment="compartment" initialAmount="0" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
Modified: trunk/test-suite/cases/semantic/00033/00033-sbml-l2v3.xml
===================================================================
--- trunk/test-suite/cases/semantic/00033/00033-sbml-l2v3.xml 2009-03-17 23:21:56 UTC (rev 9409)
+++ trunk/test-suite/cases/semantic/00033/00033-sbml-l2v3.xml 2009-03-17 23:35:01 UTC (rev 9410)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated 6-February-2008 14:54:05.7343750 -->
-<!-- Generated by MathSBML 2.7.1 (7 December 2007) -->
+<!-- Generated 17-March-2009 16:26:51.1093750 -->
+<!-- Generated by MathSBML 2.7.5 [2-May-2008] -->
<!-- Generated using Mathematica Version 5.2 for Microsoft Windows (June 20, 2005) -->
<sbml xmlns="http://www.sbml.org/sbml/level2/version3"
level="2"
@@ -17,7 +17,7 @@
name="compartment"
spatialDimensions="3"
units="volume"
- size="1"/>
+ size="1."/>
</listOfCompartments>
<listOfSpecies>
<species id="S1"
@@ -25,7 +25,7 @@
compartment="compartment"
boundaryCondition="false"
constant="false"
- initialAmount="1.5000000000000001e-15"
+ initialAmount="0.15000000000000002"
substanceUnits="substance"
hasOnlySubstanceUnits="false"/>
<species id="S2"
@@ -40,7 +40,7 @@
<listOfParameters>
<parameter id="k1"
name="k1"
- value="1"
+ value="1."
constant="false"/>
</listOfParameters>
<!-- <listOfInitialAssignments/> -->
Modified: trunk/test-suite/cases/semantic/00033/00033-sbml-l2v4.xml
===================================================================
--- trunk/test-suite/cases/semantic/00033/00033-sbml-l2v4.xml 2009-03-17 23:21:56 UTC (rev 9409)
+++ trunk/test-suite/cases/semantic/00033/00033-sbml-l2v4.xml 2009-03-17 23:35:01 UTC (rev 9410)
@@ -5,7 +5,7 @@
<compartment id="compartment" name="compartment" size="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1.5e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.15" substanceUnits="substance"/>
<species id="S2" name="S2" compartment="compartment" initialAmount="0" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
Modified: trunk/test-suite/cases/semantic/00033/00033-settings.txt
===================================================================
--- trunk/test-suite/cases/semantic/00033/00033-settings.txt 2009-03-17 23:21:56 UTC (rev 9409)
+++ trunk/test-suite/cases/semantic/00033/00033-settings.txt 2009-03-17 23:35:01 UTC (rev 9410)
@@ -2,7 +2,7 @@
duration: 3.0
steps: 50
variables: S1, S2
-absolute: 0.0000000000000000001
+absolute: 1.000000e-004
relative: 0.0001
amount: S1, S2
concentration:
Modified: trunk/test-suite/cases/semantic/00034/00034-model.m
===================================================================
--- trunk/test-suite/cases/semantic/00034/00034-model.m 2009-03-17 23:21:56 UTC (rev 9409)
+++ trunk/test-suite/cases/semantic/00034/00034-model.m 2009-03-17 23:35:01 UTC (rev 9410)
@@ -25,9 +25,9 @@
The initial conditions are as follows:
[{width:30em,margin-left:5em}| |*Value* |*Units* |
-|Initial amount of S1 |$1.0 \x 10^-15$ |mole |
-|Initial amount of S2 |$2.0 \x 10^-15$ |mole |
-|Initial amount of S3 |$1.0 \x 10^-15$ |mole |
+|Initial amount of S1 |$1.0 \x 10^-4$ |mole |
+|Initial amount of S2 |$2.0 \x 10^-4$ |mole |
+|Initial amount of S3 |$1.0 \x 10^-4$ |mole |
|Value of parameter k1 |$ 0.75$ |litre mole^-1^ second^-1^ |
|Value of parameter k2 |$ 0.25$ |second^-1^ |
|Volume of compartment "compartment" |$ 1$ |litre |]
@@ -43,9 +43,9 @@
addFunction[ multiply, arguments -> {x, y, z}, math -> x * y * z];
addCompartment[ compartment, size -> 1 ];
-addSpecies[ S1, initialAmount -> 1.0 10^-15];
-addSpecies[ S2, initialAmount -> 2.0 10^-15];
-addSpecies[ S3, initialAmount -> 1.0 10^-15];
+addSpecies[ S1, initialAmount -> 1.0 10^-4];
+addSpecies[ S2, initialAmount -> 2.0 10^-4];
+addSpecies[ S3, initialAmount -> 1.0 10^-4];
addParameter[ k1, value -> 0.75 ];
addParameter[ k2, value -> 0.25 ];
addReaction[ S1 + S2 -> S3, reversible -> False,
Modified: trunk/test-suite/cases/semantic/00034/00034-plot.eps
===================================================================
--- trunk/test-suite/cases/semantic/00034/00034-plot.eps 2009-03-17 23:21:56 UTC (rev 9409)
+++ trunk/test-suite/cases/semantic/00034/00034-plot.eps 2009-03-17 23:35:01 UTC (rev 9410)
@@ -2,16 +2,13 @@
%%BoundingBox: 88 4 376 144
%%HiResBoundingBox: 88 4 376 143.563
%%Creator: (Mathematica 5.2 for Microsoft Windows)
-%%CreationDate: (Wednesday, February 6, 2008) (16:47:50)
+%%CreationDate: (Tuesday, March 17, 2009) (16:26:57)
%%Title: Clipboard
-%%DocumentNeededResources: font Math1Mono
-%%+ font Courier
+%%DocumentNeededResources: font Courier
%%DocumentSuppliedResources:
-%%DocumentNeededFonts: Math1Mono
-%%+ Courier
+%%DocumentNeededFonts: Courier
%%DocumentSuppliedFonts:
-%%DocumentFonts: Math1Mono
-%%+ Courier
+%%DocumentFonts: Courier
%%EndComments
0 147.563 translate 1 -1 scale
150 dict begin
@@ -1173,11 +1170,11 @@
/Y {0 exch rmoveto} bind def
gsave
newpath
- 143.313 112.563 moveto
- 277.500 112.563 lineto
- 277.500 29.625 lineto
- 143.313 29.625 lineto
- 143.313 112.563 lineto
+ 135.750 113.938 moveto
+ 277.313 113.938 lineto
+ 277.313 26.438 lineto
+ 135.750 26.438 lineto
+ 135.750 113.938 lineto
closepath
clip newpath
grestore
@@ -1410,7 +1407,7 @@
%%IncludeFont: Courier
/Courier findfont 10 scalefont setfont
% Scaling calculations
-0.0238095 0.047619 0.0147151 1.96643e+014 [
+0.0238095 0.047619 0.0147151 1967.57 [
[.2619 .00222 -3 -9 ]
[.2619 .00222 3 0 ]
[.5 .00222 -6 -9 ]
@@ -1419,20 +1416,20 @@
[.7381 .00222 6 0 ]
[.97619 .00222 -6 -9 ]
[.97619 .00222 6 0 ]
-[1.025 .01472 0 -6.4375 ]
-[1.025 .01472 28 6.4375 ]
-[.01131 .11304 -37.5 -6.25 ]
-[.01131 .11304 0 6.25 ]
-[.01131 .21136 -37.5 -6.25 ]
-[.01131 .21136 0 6.25 ]
-[.01131 .30968 -49.5 -6.25 ]
-[.01131 .30968 0 6.25 ]
-[.01131 .408 -37.5 -6.25 ]
-[.01131 .408 0 6.25 ]
-[.01131 .50632 -49.5 -6.25 ]
-[.01131 .50632 0 6.25 ]
-[.01131 .60464 -37.5 -6.25 ]
-[.01131 .60464 0 6.25 ]
+[1.025 .01472 0 -6.25 ]
+[1.025 .01472 28 6.25 ]
+[.01131 .11309 -42 -4.5 ]
+[.01131 .11309 0 4.5 ]
+[.01131 .21147 -36 -4.5 ]
+[.01131 .21147 0 4.5 ]
+[.01131 .30985 -42 -4.5 ]
+[.01131 .30985 0 4.5 ]
+[.01131 .40823 -36 -4.5 ]
+[.01131 .40823 0 4.5 ]
+[.01131 .50661 -42 -4.5 ]
+[.01131 .50661 0 4.5 ]
+[.01131 .60499 -36 -4.5 ]
+[.01131 .60499 0 4.5 ]
[ 0 0 0 0 ]
[ 1 .61803 0 0 ]
] MathScale
@@ -1513,10 +1510,10 @@
1 .01472 L
s
gsave
-1.025 .01472 -61 -10.4375 Mabsadd m
+1.025 .01472 -61 -10.25 Mabsadd m
1 1 Mabs scale
currentpoint translate
-0 20.875 translate 1 -1 scale
+0 20.5 translate 1 -1 scale
/g { setgray} bind def
/k { setcmykcolor} bind def
/p { gsave} bind def
@@ -1537,21 +1534,21 @@
/My {currentpoint pop exch moveto} bind def
/X {0 rmoveto} bind def
/Y {0 exch rmoveto} bind def
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
0.000 0.000 rmoveto
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
(Time) show
-87.000 13.000 moveto
+87.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
@@ -1560,174 +1557,102 @@
0.000 0.000 rmoveto
1.000 setlinewidth
grestore
-.02381 .11304 m
-.03006 .11304 L
+.02381 .11309 m
+.03006 .11309 L
s
-gsave
-.01131 .11304 -37.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(5) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-16) show
-grestore
-.02381 .21136 m
-.03006 .21136 L
+[(0.00005)] .01131 .11309 1 0 Mshowa
+.02381 .21147 m
+.03006 .21147 L
s
-gsave
-.01131 .21136 -37.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(1) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
-.02381 .30968 m
-.03006 .30968 L
+[(0.0001)] .01131 .21147 1 0 Mshowa
+.02381 .30985 m
+.03006 .30985 L
s
-gsave
-.01131 .30968 -49.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(1.5) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
-.02381 .408 m
-.03006 .408 L
+[(0.00015)] .01131 .30985 1 0 Mshowa
+.02381 .40823 m
+.03006 .40823 L
s
-gsave
-.01131 .408 -37.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(2) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
-.02381 .50632 m
-.03006 .50632 L
+[(0.0002)] .01131 .40823 1 0 Mshowa
+.02381 .50661 m
+.03006 .50661 L
s
-gsave
-.01131 .50632 -49.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(2.5) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
-.02381 .60464 m
-.03006 .60464 L
+[(0.00025)] .01131 .50661 1 0 Mshowa
+.02381 .60499 m
+.03006 .60499 L
s
-gsave
-.01131 .60464 -37.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(3) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
+[(0.0003)] .01131 .60499 1 0 Mshowa
.125 Mabswid
-.02381 .03438 m
-.02756 .03438 L
+.02381 .03439 m
+.02756 .03439 L
s
-.02381 .05404 m
-.02756 .05404 L
+.02381 .05407 m
+.02756 .05407 L
s
-.02381 .07371 m
-.02756 .07371 L
+.02381 .07374 m
+.02756 .07374 L
s
-.02381 .09337 m
-.02756 .09337 L
+.02381 .09342 m
+.02756 .09342 L
s
-.02381 .1327 m
-.02756 .1327 L
+.02381 .13277 m
+.02756 .13277 L
s
-.02381 .15237 m
-.02756 .15237 L
+.02381 .15245 m
+.02756 .15245 L
s
-.02381 .17203 m
-.02756 .17203 L
+.02381 .17212 m
+.02756 .17212 L
s
-.02381 .19169 m
-.02756 .19169 L
+.02381 .1918 m
+.02756 .1918 L
s
-.02381 .23102 m
-.02756 .23102 L
+.02381 .23115 m
+.02756 .23115 L
s
-.02381 .25069 m
-.02756 .25069 L
+.02381 .25082 m
+.02756 .25082 L
s
-.02381 .27035 m
-.02756 .27035 L
+.02381 .2705 m
+.02756 .2705 L
s
-.02381 .29002 m
-.02756 .29002 L
+.02381 .29018 m
+.02756 .29018 L
s
-.02381 .32934 m
-.02756 .32934 L
+.02381 .32953 m
+.02756 .32953 L
s
-.02381 .34901 m
-.02756 .34901 L
+.02381 .3492 m
+.02756 .3492 L
s
-.02381 .36867 m
-.02756 .36867 L
+.02381 .36888 m
+.02756 .36888 L
s
-.02381 .38834 m
-.02756 .38834 L
+.02381 .38855 m
+.02756 .38855 L
s
-.02381 .42767 m
-.02756 .42767 L
+.02381 .42791 m
+.02756 .42791 L
s
-.02381 .44733 m
-.02756 .44733 L
+.02381 .44758 m
+.02756 .44758 L
s
-.02381 .46699 m
-.02756 .46699 L
+.02381 .46726 m
+.02756 .46726 L
s
-.02381 .48666 m
-.02756 .48666 L
+.02381 .48693 m
+.02756 .48693 L
s
-.02381 .52599 m
-.02756 .52599 L
+.02381 .52628 m
+.02756 .52628 L
s
-.02381 .54565 m
-.02756 .54565 L
+.02381 .54596 m
+.02756 .54596 L
s
-.02381 .56532 m
-.02756 .56532 L
+.02381 .56563 m
+.02756 .56563 L
s
-.02381 .58498 m
-.02756 .58498 L
+.02381 .58531 m
+.02756 .58531 L
s
.25 Mabswid
.02381 0 m
@@ -1742,85 +1667,85 @@
newpath
0 1 0 r
.5 Mabswid
-.02381 .21136 m
-.06244 .24746 L
-.10458 .27932 L
-.14415 .30346 L
-.18221 .32239 L
-.22272 .33879 L
-.26171 .3516 L
-.30316 .36263 L
+.02381 .21147 m
+.06244 .24757 L
+.10458 .27942 L
+.14415 .30354 L
+.18221 .32246 L
+.22272 .33885 L
+.26171 .35164 L
+.30316 .36265 L
.34309 .37121 L
-.3815 .37793 L
-.42237 .38374 L
-.46172 .38827 L
-.49955 .39182 L
-.53984 .39491 L
-.57861 .39732 L
-.61984 .3994 L
-.65954 .40102 L
-.69774 .40228 L
-.73838 .40338 L
-.77751 .40424 L
-.81909 .40498 L
-.85916 .40555 L
-.89771 .406 L
-.93871 .40639 L
-.97619 .40668 L
+.3815 .37792 L
+.42237 .38371 L
+.46172 .38823 L
+.49955 .39177 L
+.53984 .39485 L
+.57861 .39725 L
+.61984 .39932 L
+.65954 .40093 L
+.69774 .4022 L
+.73838 .40329 L
+.77751 .40414 L
+.81909 .40487 L
+.85916 .40544 L
+.89771 .40589 L
+.93871 .40628 L
+.97619 .40656 L
s
0 0 1 r
-.02381 .408 m
-.06244 .4441 L
-.10458 .47596 L
-.14415 .5001 L
-.18221 .51903 L
-.22272 .53544 L
-.26171 .54825 L
-.30316 .55928 L
-.34309 .56786 L
-.3815 .57457 L
-.42237 .58038 L
-.46172 .58491 L
-.49955 .58846 L
-.53984 .59155 L
-.57861 .59396 L
-.61984 .59604 L
-.65954 .59766 L
-.69774 .59893 L
-.73838 .60003 L
-.77751 .60088 L
-.81909 .60162 L
-.85916 .60219 L
-.89771 .60264 L
+.02381 .40823 m
+.06244 .44433 L
+.10458 .47618 L
+.14415 .5003 L
+.18221 .51922 L
+.22272 .5356 L
+.26171 .5484 L
+.30316 .55941 L
+.34309 .56797 L
+.3815 .57468 L
+.42237 .58047 L
+.46172 .58498 L
+.49955 .58853 L
+.53984 .5916 L
+.57861 .59401 L
+.61984 .59608 L
+.65954 .59769 L
+.69774 .59895 L
+.73838 .60005 L
+.77751 .6009 L
+.81909 .60163 L
+.85916 .6022 L
+.89771 .60265 L
.93871 .60303 L
.97619 .60332 L
s
1 0 0 r
-.02381 .21136 m
-.06244 .17526 L
-.10458 .1434 L
-.14415 .11926 L
-.18221 .10032 L
-.22272 .08392 L
-.26171 .07111 L
-.30316 .06008 L
-.34309 .0515 L
-.3815 .04478 L
-.42237 .03898 L
-.46172 .03445 L
-.49955 .03089 L
-.53984 .02781 L
-.57861 .0254 L
-.61984 .02332 L
-.65954 .0217 L
-.69774 .02043 L
-.73838 .01933 L
-.77751 .01848 L
-.81909 .01774 L
-.85916 .01716 L
-.89771 .01672 L
-.93871 .01633 L
-.97619 .01604 L
+.02381 .21147 m
+.06244 .17538 L
+.10458 .14353 L
+.14415 .1194 L
+.18221 .10048 L
+.22272 .0841 L
+.26171 .0713 L
+.30316 .06029 L
+.34309 .05173 L
+.3815 .04503 L
+.42237 .03923 L
+.46172 .03472 L
+.49955 .03117 L
+.53984 .0281 L
+.57861 .0257 L
+.61984 .02362 L
+.65954 .02201 L
+.69774 .02075 L
+.73838 .01966 L
+.77751 .0188 L
+.81909 .01807 L
+.85916 .0175 L
+.89771 .01705 L
+.93871 .01667 L
+.97619 .01638 L
s
MathSubEnd
P
@@ -1903,10 +1828,10 @@
% End of sub-graphic
0 g
gsave
-.38988 .36957 -61 -10.4375 Mabsadd m
+.38988 .36957 -61 -10.25 Mabsadd m
1 1 Mabs scale
currentpoint translate
-0 20.875 translate 1 -1 scale
+0 20.5 translate 1 -1 scale
/g { setgray} bind def
/k { setcmykcolor} bind def
/p { gsave} bind def
@@ -1927,21 +1852,21 @@
/My {currentpoint pop exch moveto} bind def
/X {0 rmoveto} bind def
/Y {0 exch rmoveto} bind def
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
0.000 0.000 rmoveto
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
(S3) show
-75.000 13.000 moveto
+75.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
@@ -1984,10 +1909,10 @@
% End of sub-graphic
0 g
gsave
-.38988 1 -61 -10.4375 Mabsadd m
+.38988 1 -61 -10.25 Mabsadd m
1 1 Mabs scale
currentpoint translate
-0 20.875 translate 1 -1 scale
+0 20.5 translate 1 -1 scale
/g { setgray} bind def
/k { setcmykcolor} bind def
/p { gsave} bind def
@@ -2008,21 +1933,21 @@
/My {currentpoint pop exch moveto} bind def
/X {0 rmoveto} bind def
/Y {0 exch rmoveto} bind def
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
0.000 0.000 rmoveto
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
(S2) show
-75.000 13.000 moveto
+75.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
@@ -2065,10 +1990,10 @@
% End of sub-graphic
0 g
gsave
-.38988 1.63043 -61 -10.4375 Mabsadd m
+.38988 1.63043 -61 -10.25 Mabsadd m
1 1 Mabs scale
currentpoint translate
-0 20.875 translate 1 -1 scale
+0 20.5 translate 1 -1 scale
/g { setgray} bind def
/k { setcmykcolor} bind def
/p { gsave} bind def
@@ -2089,21 +2014,21 @@
/My {currentpoint pop exch moveto} bind def
/X {0 rmoveto} bind def
/Y {0 exch rmoveto} bind def
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
0.000 0.000 rmoveto
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
(S1) show
-75.000 13.000 moveto
+75.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
Modified: trunk/test-suite/cases/semantic/00034/00034-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00034/00034-results.csv
===================================================================
--- trunk/test-suite/cases/semantic/00034/00034-results.csv 2009-03-17 23:21:56 UTC (rev 9409)
+++ trunk/test-suite/cases/semantic/00034/00034-results.csv 2009-03-17 23:35:01 UTC (rev 9410)
@@ -1,52 +1,52 @@
time,case00034`S1,case00034`S2,case00034`S3
-0,1.e-15,2.e-15,1.e-15
-0.4,1.095162581970295e-15,2.095162581970295e-15,9.048374180297051e-16
-0.8,1.181269246932559e-15,2.181269246932561e-15,8.187307530674402e-16
-1.2,1.259181780663791e-15,2.259181780663792e-15,7.408182193362089e-16
-1.6,1.329679955414388e-15,2.32967995541439e-15,6.70320044585611e-16
-2.,1.393469341793984e-15,2.393469341793986e-15,6.065306582060158e-16
-2.4,1.45118837214135e-15,2.451188372141352e-15,5.488116278586495e-16
-2.8,1.503414705868531e-15,2.503414705868533e-15,4.965852941314687e-16
-3.2,1.550671044989897e-15,2.550671044989899e-15,4.493289550101025e-16
-3.6,1.593430347266306e-15,2.593430347266309e-15,4.065696527336932e-16
-4.,1.632120578287543e-15,2.632120578287546e-15,3.678794217124564e-16
-4.4,1.667128916312874e-15,2.667128916312877e-15,3.328710836871254e-16
-4.8,1.698805788203211e-15,2.698805788203213e-15,3.01194211796789e-16
-5.2,1.727468207069667e-15,2.727468207069669e-15,2.725317929303327e-16
-5.6,1.753403036523009e-15,2.75340303652301e-15,2.465969634769913e-16
-6.,1.776869841081263e-15,2.776869841081264e-15,2.23130158918737e-16
-6.4,1.798103482039245e-15,2.798103482039247e-15,2.018965179607549e-16
-6.8,1.817316476009517e-15,2.817316476009519e-15,1.826835239904821e-16
-7.2,1.834701114295285e-15,2.834701114295287e-15,1.652988857047143e-16
-7.6,1.850431385078339e-15,2.85043138507834e-15,1.495686149216606e-16
-8.,1.864664718722179e-15,2.86466471872218e-15,1.353352812778207e-16
-8.4,1.877543571805048e-15,2.87754357180505e-15,1.224564281949515e-16
-8.8,1.889196849192371e-15,2.889196849192372e-15,1.108031508076291e-16
-9.2,1.899741156533959e-15,2.89974115653396e-15,1.002588434660412e-16
-9.6,1.909282051768373e-15,2.909282051768375e-15,9.071794823162625e-17
-10.,1.91791500504199e-15,2.917915005041991e-15,8.20849949580096e-17
-10.4,1.925726422641095e-15,2.925726422641097e-15,7.42735773589045e-17
-10.8,1.932794491969552e-15,2.932794491969554e-15,6.720550803044694e-17
-11.2,1.939189938012012e-15,2.939189938012014e-15,6.081006198798752e-17
-11.6,1.944976783350232e-15,2.944976783350234e-15,5.502321664976713e-17
-12.,1.950212937170922e-15,2.950212937170923e-15,4.978706282907787e-17
-12.4,1.954950800874627e-15,2.954950800874628e-15,4.504919912537267e-17
-12.8,1.959237796135239e-15,2.959237796135241e-15,4.076220386476044e-17
-13.2,1.963116834196906e-15,2.963116834196908e-15,3.688316580309241e-17
-13.6,1.96662673360837e-15,2.966626733608371e-15,3.337326639162905e-17
-14.,1.969802619254503e-15,2.969802619254504e-15,3.019738074549547e-17
-14.4,1.972676277926121e-15,2.972676277926123e-15,2.732372207387693e-17
-14.8,1.975276474159989e-15,2.97527647415999e-15,2.472352584000922e-17
-15.2,1.977629230328014e-15,2.977629230328015e-15,2.237076967198413e-17
-15.6,1.979758090600221e-15,2.979758090600222e-15,2.024190939977733e-17
-16.,1.981684361657145e-15,2.981684361657147e-15,1.831563834285265e-17
-16.4,1.983427324775434e-15,2.983427324775435e-15,1.657267522456385e-17
-16.8,1.985004424440355e-15,2.985004424440356e-15,1.499557555964301e-17
-17.2,1.986431442465233e-15,2.986431442465235e-15,1.356855753476429e-17
-17.6,1.987722660691374e-15,2.987722660691375e-15,1.227733930862428e-17
-18.,1.988891003478978e-15,2.98889100347898e-15,1.110899652101933e-17
-18.4,1.989948164932499e-15,2.989948164932501e-15,1.005183506749869e-17
-18.8,1.990904723912498e-15,2.9909047239125e-15,9.095276087499552e-18
-19.2,1.991770253503691e-15,2.991770253503693e-15,8.229746496306983e-18
-19.6,1.992553416936566e-15,2.992553416936568e-15,7.446583063431985e-18
-20.,1.993262053000882e-15,2.993262053000884e-15,6.737946999115285e-18
\ No newline at end of file
+0,0.0001,0.0002,0.0001
+0.4,0.0001095101185704268,0.0002095101185704269,0.00009048988142957316
+0.8,0.0001181144069599281,0.0002181144069599282,0.00008188559304007183
+1.2,0.0001258991045544968,0.0002258991045544968,0.0000741008954455032
+1.6,0.0001329422472699064,0.0002329422472699064,0.00006705775273009363
+2.,0.0001393144472761547,0.0002393144472761548,0.00006068555272384526
+2.4,0.0001450795984151714,0.0002450795984151715,0.00005492040158482855
+2.8,0.0001502955121232816,0.0002502955121232817,0.00004970448787671837
+3.2,0.0001550144989238427,0.0002550144989238427,0.00004498550107615731
+3.6,0.0001592838895931068,0.0002592838895931068,0.00004071611040689317
+4.,0.0001631465105444803,0.0002631465105444803,0.00003685348945551974
+4.4,0.0001666411046561742,0.0002666411046561745,0.00003335889534382568
+4.8,0.0001698027350358279,0.0002698027350358282,0.00003019726496417199
+5.2,0.0001726631193237813,0.0002726631193237816,0.0000273368806762186
+5.6,0.0001752509564151416,0.0002752509564151418,0.00002474904358485839
+6.,0.0001775922118992758,0.000277592211899276,0.0000224077881007242
+6.4,0.0001797103780663186,0.0002797103780663189,0.00002028962193368134
+6.8,0.0001816267100701786,0.0002816267100701788,0.00001837328992982138
+7.2,0.0001833604383162523,0.0002833604383162526,0.0000166395616837476
+7.6,0.0001849289608100614,0.0002849289608100616,0.0000150710391899386
+8.,0.0001863480182435769,0.0002863480182435771,0.00001365198175642305
+8.4,0.0001876318525082696,0.0002876318525082699,0.00001236814749173031
+8.8,0.0001887933490866441,0.0002887933490866443,0.00001120665091335583
+9.2,0.0001898441626961193,0.0002898441626961196,0.00001015583730388064
+9.6,0.0001907948424799535,0.0002907948424799538,9.20515752004643e-6
+10.,0.000191654928308744,0.0002916549283087443,8.345071691255907e-6
+10.4,0.0001924330531584597,0.0002924330531584598,7.566946841540313e-6
+10.8,0.0001931370278747662,0.0002931370278747665,6.862972125233738e-6
+11.2,0.0001937739168704251,0.0002937739168704254,6.226083129574812e-6
+11.6,0.0001943501142494414,0.0002943501142494416,5.649885750558534e-6
+12.,0.0001948714027090762,0.0002948714027090764,5.128597290923749e-6
+12.4,0.000195343014303889,0.0002953430143038892,4.656985696110964e-6
+12.8,0.0001957696832021258,0.0002957696832021261,4.230316797874113e-6
+13.2,0.0001961556926907649,0.0002961556926907652,3.844307309234976e-6
+13.6,0.0001965049170114392,0.0002965049170114395,3.495082988560712e-6
+14.,0.0001968208612513208,0.0002968208612513211,3.179138748679095e-6
+14.4,0.0001971066969301388,0.000297106696930139,2.893303069861129e-6
+14.8,0.0001973652936202133,0.0002973652936202136,2.634706379786535e-6
+15.2,0.0001975992470092075,0.0002975992470092078,2.400752990792365e-6
+15.6,0.0001978109052016946,0.0002978109052016948,2.189094798305286e-6
+16.,0.0001980023928351154,0.0002980023928351156,1.997607164884541e-6
+16.4,0.0001981756323031491,0.0002981756323031494,1.824367696850767e-6
+16.8,0.0001983323626750603,0.0002983323626750606,1.667637324939605e-6
+17.2,0.0001984741569924392,0.0002984741569924395,1.525843007560685e-6
+17.6,0.0001986024385593296,0.0002986024385593299,1.397561440670295e-6
+18.,0.0001987184952063118,0.0002987184952063121,1.281504793688099e-6
+18.4,0.0001988234920553257,0.0002988234920553259,1.176507944674233e-6
+18.8,0.0001989184829449158,0.0002989184829449161,1.081517055084097e-6
+19.2,0.0001990044213453334,0.0002990044213453337,9.95578654666521e-7
+19.6,0.0001990821699792793,0.0002990821699792796,9.178300207205713e-7
+20.,0.0001991525093891402,0.0002991525093891405,8.474906108597139e-7
\ No newline at end of file
Modified: trunk/test-suite/cases/semantic/00034/00034-sbml-l2v1.xml
===================================================================
--- trunk/test-suite/cases/semantic/00034/00034-sbml-l2v1.xml 2009-03-17 23:21:56 UTC (rev 9409)
+++ trunk/test-suite/cases/semantic/00034/00034-sbml-l2v1.xml 2009-03-17 23:35:01 UTC (rev 9410)
@@ -28,9 +28,9 @@
<compartment id="compartment" name="compartment" size="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1e-015" substanceUnits="substance"/>
- <species id="S2" name="S2" compartment="compartment" initialAmount="2e-015" substanceUnits="substance"/>
- <species id="S3" name="S3" compartment="compartment" initialAmount="1e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.0001" substanceUnits="substance"/>
+ <species id="S2" name="S2" compartment="compartment" initialAmount="0.0002" substanceUnits="substance"/>
+ <species id="S3" name="S3" compartment="compartment" initialAmount="0.0001" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
<parameter id="k1" name="k1" value="0.75"/>
Modified: trunk/test-suite/cases/semantic/00034/00034-sbml-l2v2.xml
===================================================================
--- trunk/test-suite/cases/semantic/00034/00034-sbml-l2v2.xml 2009-03-17 23:21:56 UTC (rev 9409)
+++ trunk/test-suite/cases/semantic/00034/00034-sbml-l2v2.xml 2009-03-17 23:35:01 UTC (rev 9410)
@@ -28,9 +28,9 @@
<compartment id="compartment" name="compartment" size="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1e-015" substanceUnits="substance"/>
- <species id="S2" name="S2" compartment="compartment" initialAmount="2e-015" substanceUnits="substance"/>
- <species id="S3" name="S3" compartment="compartment" initialAmount="1e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.0001" substanceUnits="substance"/>
+ <species id="S2" name="S2" compartment="compartment" initialAmount="0.0002" substanceUnits="substance"/>
+ <species id="S3" name="S3" compartment="compartment" initialAmount="0.0001" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
<parameter id="k1" name="k1" value="0.75"/>
Modified: trunk/test-suite/cases/semantic/00034/00034-sbml-l2v3.xml
===================================================================
--- trunk/test-suite/cases/semantic/00034/00034-sbml-l2v3.xml 2009-03-17 23:21:56 UTC (rev 9409)
+++ trunk/test-suite/cases/semantic/00034/00034-sbml-l2v3.xml 2009-03-17 23:35:01 UTC (rev 9410)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated 6-February-2008 16:47:50.1406250 -->
-<!-- Generated by MathSBML 2.7.1 (7 December 2007) -->
+<!-- Generated 17-March-2009 16:26:56.5468750 -->
+<!-- Generated by MathSBML 2.7.5 [2-May-2008] -->
<!-- Generated using Mathematica Version 5.2 for Microsoft Windows (June 20, 2005) -->
<sbml xmlns="http://www.sbml.org/sbml/level2/version3"
level="2"
@@ -40,7 +40,7 @@
name="compartment"
spatialDimensions="3"
units="volume"
- size="1"/>
+ size="1."/>
</listOfCompartments>
<listOfSpecies>
<species id="S1"
@@ -48,7 +48,7 @@
compartment="compartment"
boundaryCondition="false"
constant="false"
- initialAmount="1.e-15"
+ initialAmount="0.0001"
substanceUnits="substance"
hasOnlySubstanceUnits="false"/>
<species id="S2"
@@ -56,7 +56,7 @@
compartment="compartment"
boundaryCondition="false"
constant="false"
- initialAmount="2.e-15"
+ initialAmount="0.0002"
substanceUnits="substance"
hasOnlySubstanceUnits="false"/>
<species id="S3"
@@ -64,7 +64,7 @@
compartment="compartment"
boundaryCondition="false"
constant="false"
- initialAmount="1.e-15"
+ initialAmount="0.0001"
substanceUnits="substance"
hasOnlySubstanceUnits="false"/>
</listOfSpecies>
Modified: trunk/test-suite/cases/semantic/00034/00034-sbml-l2v4.xml
===================================================================
--- trunk/test-suite/cases/semantic/00034/00034-sbml-l2v4.xml 2009-03-17 23:21:56 UTC (rev 9409)
+++ trunk/test-suite/cases/semantic/00034/00034-sbml-l2v4.xml 2009-03-17 23:35:01 UTC (rev 9410)
@@ -28,9 +28,9 @@
<compartment id="compartment" name="compartment" size="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1e-015" substanceUnits="substance"/>
- <species id="S2" name="S2" compartment="compartment" initialAmount="2e-015" substanceUnits="substance"/>
- <species id="S3" name="S3" compartment="compartment" initialAmount="1e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.0001" substanceUnits="substance"/>
+ <species id="S2" name="S2" compartment="compartment" initialAmount="0.0002" substanceUnits="substance"/>
+ <species id="S3" name="S3" compartment="compartment" initialAmount="0.0001" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
<parameter id="k1" name="k1" value="0.75"/>
Modified: trunk/test-suite/cases/semantic/00034/00034-settings.txt
===================================================================
--- trunk/test-suite/cases/semantic/00034/00034-settings.txt 2009-03-17 23:21:56 UTC (rev 9409)
+++ trunk/test-suite/cases/semantic/00034/00034-settings.txt 2009-03-17 23:35:01 UTC (rev 9410)
@@ -2,7 +2,7 @@
duration: 20.0
steps: 50
variables: S1, S2, S3
-absolute: 0.0000000000000000001
+absolute: 1.000000e-007
relative: 0.0001
amount: S1, S2, S3
concentration:
Modified: trunk/test-suite/cases/semantic/00035/00035-model.m
===================================================================
--- trunk/test-suite/cases/semantic/00035/00035-model.m 2009-03-17 23:21:56 UTC (rev 9409)
+++ trunk/test-suite/cases/semantic/00035/00035-model.m 2009-03-17 23:35:01 UTC (rev 9410)
@@ -25,12 +25,12 @@
The initial conditions are as follows:
[{width:30em,margin-left:5em}| |*Value* |*Units* |
-|Initial amount of S1 |$1.0 \x 10^-15$ |mole |
-|Initial amount of S2 |$1.0 \x 10^-15$ |mole |
-|Initial amount of S3 |$2.0 \x 10^-15$ |mole |
-|Initial amount of S4 |$1.0 \x 10^-15$ |mole |
-|Value of parameter k1 |$0.75 \x 10^15$ |litre mole^-1^ second^-1^ |
-|Value of parameter k2 |$0.25 \x 10^15$ |litre mole^-1^ second^-1^ |
+|Initial amount of S1 |$1.0 \x 10^-3$ |mole |
+|Initial amount of S2 |$1.0 \x 10^-3$ |mole |
+|Initial amount of S3 |$2.0 \x 10^-3$ |mole |
+|Initial amount of S4 |$1.0 \x 10^-3$ |mole |
+|Value of parameter k1 |$0.75 \x 10^3$ |litre mole^-1^ second^-1^ |
+|Value of parameter k2 |$0.25 \x 10^3$ |litre mole^-1^ second^-1^ |
|Volume of compartment "compartment" |$ 1$ |litre |]
The species values are given as amounts of substance to make it easier to
@@ -44,12 +44,12 @@
addFunction[ multiply, arguments -> {x, y}, math -> x * y];
addCompartment[ compartment, size -> 1 ];
-addSpecies[ S1, initialAmount -> 1.0 10^-15];
-addSpecies[ S2, initialAmount -> 1.0 10^-15];
-addSpecies[ S3, initialAmount -> 2.0 10^-15];
-addSpecies[ S4, initialAmount -> 1.0 10^-15];
-addParameter[ k1, value -> 0.75 10^15 ];
-addParameter[ k2, value -> 0.25 10^15 ];
+addSpecies[ S1, initialAmount -> 1.0 10^-3];
+addSpecies[ S2, initialAmount -> 1.0 10^-3];
+addSpecies[ S3, initialAmount -> 2.0 10^-3];
+addSpecies[ S4, initialAmount -> 1.0 10^-3];
+addParameter[ k1, value -> 0.75 10^3 ];
+addParameter[ k2, value -> 0.25 10^3 ];
addReaction[ S1 + S2 -> S3 + S4, reversible -> False,
kineticLaw -> multiply[k1,multiply[S1,S2]] * compartment ];
addReaction[ S3 + S4 -> S1 + S2, reversible -> False,
Modified: trunk/test-suite/cases/semantic/00035/00035-plot.eps
===================================================================
--- trunk/test-suite/cases/semantic/00035/00035-plot.eps 2009-03-17 23:21:56 UTC (rev 9409)
+++ trunk/test-suite/cases/semantic/00035/00035-plot.eps 2009-03-17 23:35:01 UTC (rev 9410)
@@ -2,16 +2,13 @@
%%BoundingBox: 88 4 376 144
%%HiResBoundingBox: 88 4 376 143.563
%%Creator: (Mathematica 5.2 for Microsoft Windows)
-%%CreationDate: (Wednesday, February 6, 2008) (17:10:50)
+%%CreationDate: (Tuesday, March 17, 2009) (16:27:03)
%%Title: Clipboard
-%%DocumentNeededResources: font Math1Mono
-%%+ font Courier
+%%DocumentNeededResources: font Courier
%%DocumentSuppliedResources:
-%%DocumentNeededFonts: Math1Mono
-%%+ Courier
+%%DocumentNeededFonts: Courier
%%DocumentSuppliedFonts:
-%%DocumentFonts: Math1Mono
-%%+ Courier
+%%DocumentFonts: Courier
%%EndComments
0 147.563 translate 1 -1 scale
150 dict begin
@@ -1173,11 +1170,11 @@
/Y {0 exch rmoveto} bind def
gsave
newpath
- 149.375 109.563 moveto
- 277.625 109.563 lineto
- 277.625 30.313 lineto
- 149.375 30.313 lineto
- 149.375 109.563 lineto
+ 129.688 118.500 moveto
+ 277.188 118.500 lineto
+ 277.188 27.313 lineto
+ 129.688 27.313 lineto
+ 129.688 118.500 lineto
closepath
clip newpath
grestore
@@ -1440,33 +1437,29 @@
%%IncludeFont: Courier
/Courier findfont 10 scalefont setfont
% Scaling calculations
-0.0238095 0.380952 -0.171676 3.43352e+014 [
-[.21429 -0.0125 -9 -9 ]
-[.21429 -0.0125 9 0 ]
-[.40476 -0.0125 -3 -9 ]
-[.40476 -0.0125 3 0 ]
-[.59524 -0.0125 -9 -9 ]
-[.59524 -0.0125 9 0 ]
-[.78571 -0.0125 -3 -9 ]
-[.78571 -0.0125 3 0 ]
-[.97619 -0.0125 -9 -9 ]
-[.97619 -0.0125 9 0 ]
-[1.025 0 0 -6.4375 ]
-[1.025 0 28 6.4375 ]
-[.01131 .08584 -49.5 -6.25 ]
-[.01131 .08584 0 6.25 ]
-[.01131 .17168 -37.5 -6.25 ]
-[.01131 .17168 0 6.25 ]
-[.01131 .25751 -55.5 -6.25 ]
-[.01131 .25751 0 6.25 ]
-[.01131 .34335 -49.5 -6.25 ]
-[.01131 .34335 0 6.25 ]
-[.01131 .42919 -55.5 -6.25 ]
-[.01131 .42919 0 6.25 ]
-[.01131 .51503 -37.5 -6.25 ]
-[.01131 .51503 0 6.25 ]
-[.01131 .60087 -55.5 -6.25 ]
-[.01131 .60087 0 6.25 ]
+0.0238095 0.380952 -0.410587 479.736 [
+[.21429 .05665 -9 -9 ]
+[.21429 .05665 9 0 ]
+[.40476 .05665 -3 -9 ]
+[.40476 .05665 3 0 ]
+[.59524 .05665 -9 -9 ]
+[.59524 .05665 9 0 ]
+[.78571 .05665 -3 -9 ]
+[.78571 .05665 3 0 ]
+[.97619 .05665 -9 -9 ]
+[.97619 .05665 9 0 ]
+[1.025 .06915 0 -6.25 ]
+[1.025 .06915 28 6.25 ]
+[.01131 .1651 -36 -4.5 ]
+[.01131 .1651 0 4.5 ]
+[.01131 .26104 -36 -4.5 ]
+[.01131 .26104 0 4.5 ]
+[.01131 .35699 -36 -4.5 ]
+[.01131 .35699 0 4.5 ]
+[.01131 .45294 -36 -4.5 ]
+[.01131 .45294 0 4.5 ]
+[.01131 .54888 -30 -4.5 ]
+[.01131 .54888 0 4.5 ]
[ 0 0 0 0 ]
[ 1 .61803 0 0 ]
] MathScale
@@ -1477,96 +1470,96 @@
0 g
.25 Mabswid
[ ] 0 setdash
-.21429 0 m
-.21429 .00625 L
+.21429 .06915 m
+.21429 .0754 L
s
-[(0.5)] .21429 -0.0125 0 1 Mshowa
-.40476 0 m
-.40476 .00625 L
+[(0.5)] .21429 .05665 0 1 Mshowa
+.40476 .06915 m
+.40476 .0754 L
s
-[(1)] .40476 -0.0125 0 1 Mshowa
-.59524 0 m
-.59524 .00625 L
+[(1)] .40476 .05665 0 1 Mshowa
+.59524 .06915 m
+.59524 .0754 L
s
-[(1.5)] .59524 -0.0125 0 1 Mshowa
-.78571 0 m
-.78571 .00625 L
+[(1.5)] .59524 .05665 0 1 Mshowa
+.78571 .06915 m
+.78571 .0754 L
s
-[(2)] .78571 -0.0125 0 1 Mshowa
-.97619 0 m
-.97619 .00625 L
+[(2)] .78571 .05665 0 1 Mshowa
+.97619 .06915 m
+.97619 .0754 L
s
-[(2.5)] .97619 -0.0125 0 1 Mshowa
+[(2.5)] .97619 .05665 0 1 Mshowa
.125 Mabswid
-.0619 0 m
-.0619 .00375 L
+.0619 .06915 m
+.0619 .0729 L
s
-.1 0 m
-.1 .00375 L
+.1 .06915 m
+.1 .0729 L
s
-.1381 0 m
-.1381 .00375 L
+.1381 .06915 m
+.1381 .0729 L
s
-.17619 0 m
-.17619 .00375 L
+.17619 .06915 m
+.17619 .0729 L
s
-.25238 0 m
-.25238 .00375 L
+.25238 .06915 m
+.25238 .0729 L
s
-.29048 0 m
-.29048 .00375 L
+.29048 .06915 m
+.29048 .0729 L
s
-.32857 0 m
-.32857 .00375 L
+.32857 .06915 m
+.32857 .0729 L
s
-.36667 0 m
-.36667 .00375 L
+.36667 .06915 m
+.36667 .0729 L
s
-.44286 0 m
-.44286 .00375 L
+.44286 .06915 m
+.44286 .0729 L
s
-.48095 0 m
-.48095 .00375 L
+.48095 .06915 m
+.48095 .0729 L
s
-.51905 0 m
-.51905 .00375 L
+.51905 .06915 m
+.51905 .0729 L
s
-.55714 0 m
-.55714 .00375 L
+.55714 .06915 m
+.55714 .0729 L
s
-.63333 0 m
-.63333 .00375 L
+.63333 .06915 m
+.63333 .0729 L
s
-.67143 0 m
-.67143 .00375 L
+.67143 .06915 m
+.67143 .0729 L
s
-.70952 0 m
-.70952 .00375 L
+.70952 .06915 m
+.70952 .0729 L
s
-.74762 0 m
-.74762 .00375 L
+.74762 .06915 m
+.74762 .0729 L
s
-.82381 0 m
-.82381 .00375 L
+.82381 .06915 m
+.82381 .0729 L
s
-.8619 0 m
-.8619 .00375 L
+.8619 .06915 m
+.8619 .0729 L
s
-.9 0 m
-.9 .00375 L
+.9 .06915 m
+.9 .0729 L
s
-.9381 0 m
-.9381 .00375 L
+.9381 .06915 m
+.9381 .0729 L
s
.25 Mabswid
-0 0 m
-1 0 L
+0 .06915 m
+1 .06915 L
s
gsave
-1.025 0 -61 -10.4375 Mabsadd m
+1.025 .06915 -61 -10.25 Mabsadd m
1 1 Mabs scale
currentpoint translate
-0 20.875 translate 1 -1 scale
+0 20.5 translate 1 -1 scale
/g { setgray} bind def
/k { setcmykcolor} bind def
/p { gsave} bind def
@@ -1587,212 +1580,107 @@
/My {currentpoint pop exch moveto} bind def
/X {0 rmoveto} bind def
/Y {0 exch rmoveto} bind def
-63.000 13.000 moveto
+63.000 12.750 moveto
%%IncludeResource: font Courier
%%IncludeFont: Courier
/Courier findfont 10.000 scalefont
[1 0 0 -1 0 0 ] makefont setfont
0.000 0.000 0.000 setrgbcolor
+0.000 0.000 rmoveto
+63.000 12.750 moveto
+%%IncludeResource: font Courier
+%%IncludeFont: Courier
+/Courier findfont 10.000 scalefont
+[1 0 0 -1 0 0 ] makefont setfont
+0.000 0.000 0.000 setrgbcolor
(Time) show
+87.000 12.750 moveto
+%%IncludeResource: font Courier
+%%IncludeFont: Courier
+/Courier findfont 10.000 scalefont
+[1 0 0 -1 0 0 ] makefont setfont
+0.000 0.000 0.000 setrgbcolor
+0.000 0.000 rmoveto
1.000 setlinewidth
grestore
-.02381 .08584 m
-.03006 .08584 L
+.02381 .1651 m
+.03006 .1651 L
s
-gsave
-.01131 .08584 -49.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(7.5) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-16) show
-grestore
-.02381 .17168 m
-.03006 .17168 L
+[(0.0012)] .01131 .1651 1 0 Mshowa
+.02381 .26104 m
+.03006 .26104 L
s
-gsave
-.01131 .17168 -37.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(1) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
-.02381 .25751 m
-.03006 .25751 L
+[(0.0014)] .01131 .26104 1 0 Mshowa
+.02381 .35699 m
+.03006 .35699 L
s
-gsave
-.01131 .25751 -55.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(1.25) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
-.02381 .34335 m
-.03006 .34335 L
+[(0.0016)] .01131 .35699 1 0 Mshowa
+.02381 .45294 m
+.03006 .45294 L
s
-gsave
-.01131 .34335 -49.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(1.5) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
-.02381 .42919 m
-.03006 .42919 L
+[(0.0018)] .01131 .45294 1 0 Mshowa
+.02381 .54888 m
+.03006 .54888 L
s
-gsave
-.01131 .42919 -55.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier fin...
[truncated message content] |
|
From: <sar...@us...> - 2009-03-17 23:22:03
|
Revision: 9409
http://sbml.svn.sourceforge.net/sbml/?rev=9409&view=rev
Author: sarahkeating
Date: 2009-03-17 23:21:56 +0000 (Tue, 17 Mar 2009)
Log Message:
-----------
changes values used so that tolerance does not exceed machine double precision
Modified Paths:
--------------
trunk/test-suite/cases/semantic/00032/00032-model.m
trunk/test-suite/cases/semantic/00032/00032-results.csv
trunk/test-suite/cases/semantic/00032/00032-sbml-l1v2.xml
trunk/test-suite/cases/semantic/00032/00032-sbml-l2v1.xml
trunk/test-suite/cases/semantic/00032/00032-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00032/00032-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00032/00032-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00032/00032-settings.txt
Modified: trunk/test-suite/cases/semantic/00032/00032-model.m
===================================================================
--- trunk/test-suite/cases/semantic/00032/00032-model.m 2009-03-17 23:19:37 UTC (rev 9408)
+++ trunk/test-suite/cases/semantic/00032/00032-model.m 2009-03-17 23:21:56 UTC (rev 9409)
@@ -19,7 +19,7 @@
The initial conditions are as follows:
[{width:30em,margin-left:5em}| |*Value* |*Units* |
-|Initial amount of S1 |$1.5 \x 10^-15$ |mole |
+|Initial amount of S1 |$1.5 \x 10^-2$ |mole |
|Initial amount of S2 |$ 0$ |mole |
|Value of parameter k1 |$ 1$ |second^-1^ |
|Volume of compartment "compartment" |$ 1$ |litre |]
@@ -37,7 +37,7 @@
newcase[ "00032" ];
addCompartment[ compartment, size -> 1 ];
-addSpecies[ S1, initialAmount -> 1.5 10^-15 ];
+addSpecies[ S1, initialAmount -> 1.5 10^-2 ];
addSpecies[ S2, initialAmount -> 0 ];
addParameter[ k1, value -> 1 ];
addRule[ type->RateRule, variable -> S1, math -> -(k1 * S1)];
Modified: trunk/test-suite/cases/semantic/00032/00032-results.csv
===================================================================
--- trunk/test-suite/cases/semantic/00032/00032-results.csv 2009-03-17 23:19:37 UTC (rev 9408)
+++ trunk/test-suite/cases/semantic/00032/00032-results.csv 2009-03-17 23:21:56 UTC (rev 9409)
@@ -1,52 +1,52 @@
-time,case00032`S1,case00032`S2
-0,1.5e-015,0
-0.1,1.35726e-015,1.42744e-016
-0.2,1.2281e-015,2.71904e-016
-0.3,1.11123e-015,3.88773e-016
-0.4,1.00548e-015,4.9452e-016
-0.5,9.09796e-016,5.90204e-016
-0.6,8.23217e-016,6.76783e-016
-0.7,7.44878e-016,7.55122e-016
-0.8,6.73993e-016,8.26007e-016
-0.9,6.09854e-016,8.90146e-016
-1,5.51819e-016,9.48181e-016
-1.1,4.99307e-016,1.00069e-015
-1.2,4.51791e-016,1.04821e-015
-1.3,4.08798e-016,1.0912e-015
-1.4,3.69895e-016,1.1301e-015
-1.5,3.34695e-016,1.1653e-015
-1.6,3.02845e-016,1.19716e-015
-1.7,2.74025e-016,1.22597e-015
-1.8,2.47948e-016,1.25205e-015
-1.9,2.24353e-016,1.27565e-015
-2,2.03003e-016,1.297e-015
-2.1,1.83685e-016,1.31632e-015
-2.2,1.66205e-016,1.3338e-015
-2.3,1.50388e-016,1.34961e-015
-2.4,1.36077e-016,1.36392e-015
-2.5,1.23127e-016,1.37687e-015
-2.6,1.1141e-016,1.38859e-015
-2.7,1.00808e-016,1.39919e-015
-2.8,9.12151e-017,1.40878e-015
-2.9,8.25348e-017,1.41747e-015
-3,7.46806e-017,1.42532e-015
-3.1,6.75738e-017,1.43243e-015
-3.2,6.11433e-017,1.43886e-015
-3.3,5.53248e-017,1.44468e-015
-3.4,5.00599e-017,1.44994e-015
-3.5,4.52961e-017,1.4547e-015
-3.6,4.09856e-017,1.45901e-015
-3.7,3.70853e-017,1.46291e-015
-3.8,3.35562e-017,1.46644e-015
-3.9,3.03629e-017,1.46964e-015
-4,2.74735e-017,1.47253e-015
-4.1,2.4859e-017,1.47514e-015
-4.2,2.24934e-017,1.47751e-015
-4.3,2.03528e-017,1.47965e-015
-4.4,1.8416e-017,1.48158e-015
-4.5,1.66635e-017,1.48334e-015
-4.6,1.50778e-017,1.48492e-015
-4.7,1.36429e-017,1.48636e-015
-4.8,1.23446e-017,1.48766e-015
-4.9,1.11699e-017,1.48883e-015
-5,1.01069e-017,1.48989e-015
\ No newline at end of file
+time,S1,S2
+0,0.015,0
+0.1,0.01357256127053939,0.001427438729460607
+0.2,0.01228096129616973,0.002719038703830272
+0.3,0.01111227331022577,0.003887726689774232
+0.4,0.01005480069053459,0.004945199309465411
+0.5,0.009097959895689501,0.005902040104310499
+0.6,0.008232174541410396,0.006767825458589605
+0.7,0.007448779556871142,0.007551220443128857
+0.8,0.006739934461758324,0.008260065538241676
+0.9,0.006098544896108987,0.008901455103891013
+1,0.005518191617571635,0.009481808382428365
+1.1,0.004993066255471193,0.01000693374452881
+1.2,0.00451791317868303,0.01048208682131697
+1.3,0.004087976895510189,0.01091202310448981
+1.4,0.003698954459124097,0.0113010455408759
+1.5,0.003346952402226447,0.01165304759777355
+1.6,0.003028447769919831,0.01197155223008017
+1.7,0.002740252860791019,0.01225974713920898
+1.8,0.002479483323323798,0.0125205166766762
+1.9,0.002243529288339526,0.01275647071166047
+2,0.00203002924854919,0.01296997075145081
+2.1,0.001836846423794729,0.01316315357620527
+2.2,0.001662047375435008,0.01333795262456499
+2.3,0.001503882655842056,0.01349611734415794
+2.4,0.001360769299341187,0.01363923070065881
+2.5,0.001231274979358482,0.01376872502064152
+2.6,0.001114103673215008,0.01388589632678499
+2.7,0.001008082691096246,0.01399191730890376
+2.8,0.0009121509393782692,0.01408784906062173
+2.9,0.0008253483008461082,0.01417465169915389
+3,0.0007468060255179592,0.01425319397448204
+3.1,0.000675738035903367,0.01432426196409663
+3.2,0.0006114330596754932,0.01438856694032451
+3.3,0.0005532475110185999,0.0144467524889814
+3.4,0.000500599049404891,0.01449940095059511
+3.5,0.0004529607513347775,0.01454703924866522
+3.6,0.0004098558367093884,0.01459014416329061
+3.7,0.0003708528970550908,0.01462914710294491
+3.8,0.0003355615778424838,0.01466443842215752
+3.9,0.0003036286716870657,0.01469637132831293
+4,0.0002747345833310127,0.01472526541666899
+4.1,0.0002485901310264186,0.01475140986897358
+4.2,0.0002249336523071656,0.01477506634769283
+4.3,0.000203528385183014,0.01479647161481699
+4.4,0.0001841600985460266,0.01481583990145397
+4.5,0.0001666349480736346,0.01483336505192637
+4.6,0.0001507775361695037,0.0148492224638305
+4.7,0.0001364291565254372,0.01486357084347456
+4.8,0.0001234462057353003,0.0148765537942647
+4.9,0.0001116987460638651,0.01488830125393614
+5,0.000101069204986282,0.01489893079501372
Modified: trunk/test-suite/cases/semantic/00032/00032-sbml-l1v2.xml
===================================================================
--- trunk/test-suite/cases/semantic/00032/00032-sbml-l1v2.xml 2009-03-17 23:19:37 UTC (rev 9408)
+++ trunk/test-suite/cases/semantic/00032/00032-sbml-l1v2.xml 2009-03-17 23:21:56 UTC (rev 9409)
@@ -5,7 +5,7 @@
<compartment name="compartment" volume="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species name="S1" compartment="compartment" initialAmount="1.5e-015" units="substance"/>
+ <species name="S1" compartment="compartment" initialAmount="0.015" units="substance"/>
<species name="S2" compartment="compartment" initialAmount="0" units="substance"/>
</listOfSpecies>
<listOfParameters>
Modified: trunk/test-suite/cases/semantic/00032/00032-sbml-l2v1.xml
===================================================================
--- trunk/test-suite/cases/semantic/00032/00032-sbml-l2v1.xml 2009-03-17 23:19:37 UTC (rev 9408)
+++ trunk/test-suite/cases/semantic/00032/00032-sbml-l2v1.xml 2009-03-17 23:21:56 UTC (rev 9409)
@@ -5,7 +5,7 @@
<compartment id="compartment" name="compartment" size="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1.5e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.015" substanceUnits="substance"/>
<species id="S2" name="S2" compartment="compartment" initialAmount="0" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
Modified: trunk/test-suite/cases/semantic/00032/00032-sbml-l2v2.xml
===================================================================
--- trunk/test-suite/cases/semantic/00032/00032-sbml-l2v2.xml 2009-03-17 23:19:37 UTC (rev 9408)
+++ trunk/test-suite/cases/semantic/00032/00032-sbml-l2v2.xml 2009-03-17 23:21:56 UTC (rev 9409)
@@ -5,7 +5,7 @@
<compartment id="compartment" name="compartment" size="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1.5e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.015" substanceUnits="substance"/>
<species id="S2" name="S2" compartment="compartment" initialAmount="0" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
Modified: trunk/test-suite/cases/semantic/00032/00032-sbml-l2v3.xml
===================================================================
--- trunk/test-suite/cases/semantic/00032/00032-sbml-l2v3.xml 2009-03-17 23:19:37 UTC (rev 9408)
+++ trunk/test-suite/cases/semantic/00032/00032-sbml-l2v3.xml 2009-03-17 23:21:56 UTC (rev 9409)
@@ -25,7 +25,7 @@
compartment="compartment"
boundaryCondition="false"
constant="false"
- initialAmount="1.5000000000000001e-15"
+ initialAmount="1.5e-2"
substanceUnits="substance"
hasOnlySubstanceUnits="false"/>
<species id="S2"
Modified: trunk/test-suite/cases/semantic/00032/00032-sbml-l2v4.xml
===================================================================
--- trunk/test-suite/cases/semantic/00032/00032-sbml-l2v4.xml 2009-03-17 23:19:37 UTC (rev 9408)
+++ trunk/test-suite/cases/semantic/00032/00032-sbml-l2v4.xml 2009-03-17 23:21:56 UTC (rev 9409)
@@ -5,7 +5,7 @@
<compartment id="compartment" name="compartment" size="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1.5e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.015" substanceUnits="substance"/>
<species id="S2" name="S2" compartment="compartment" initialAmount="0" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
Modified: trunk/test-suite/cases/semantic/00032/00032-settings.txt
===================================================================
--- trunk/test-suite/cases/semantic/00032/00032-settings.txt 2009-03-17 23:19:37 UTC (rev 9408)
+++ trunk/test-suite/cases/semantic/00032/00032-settings.txt 2009-03-17 23:21:56 UTC (rev 9409)
@@ -2,7 +2,7 @@
duration: 5.0
steps: 50
variables: S1, S2
-absolute: 0.0000000000000000001
+absolute: 1.000000e-005
relative: 0.0001
amount: S1, S2
concentration:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sar...@us...> - 2009-03-17 23:19:48
|
Revision: 9408
http://sbml.svn.sourceforge.net/sbml/?rev=9408&view=rev
Author: sarahkeating
Date: 2009-03-17 23:19:37 +0000 (Tue, 17 Mar 2009)
Log Message:
-----------
changes values used so that tolerance does not exceed machine double precision
Modified Paths:
--------------
trunk/test-suite/cases/semantic/00023/00023-model.m
trunk/test-suite/cases/semantic/00023/00023-plot.eps
trunk/test-suite/cases/semantic/00023/00023-plot.jpg
trunk/test-suite/cases/semantic/00023/00023-results.csv
trunk/test-suite/cases/semantic/00023/00023-sbml-l2v1.xml
trunk/test-suite/cases/semantic/00023/00023-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00023/00023-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00023/00023-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00023/00023-settings.txt
trunk/test-suite/cases/semantic/00024/00024-model.m
trunk/test-suite/cases/semantic/00024/00024-results.csv
trunk/test-suite/cases/semantic/00024/00024-sbml-l2v1.xml
trunk/test-suite/cases/semantic/00024/00024-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00024/00024-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00024/00024-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00024/00024-settings.txt
trunk/test-suite/cases/semantic/00025/00025-model.m
trunk/test-suite/cases/semantic/00025/00025-results.csv
trunk/test-suite/cases/semantic/00025/00025-sbml-l2v1.xml
trunk/test-suite/cases/semantic/00025/00025-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00025/00025-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00025/00025-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00025/00025-settings.txt
Modified: trunk/test-suite/cases/semantic/00023/00023-model.m
===================================================================
--- trunk/test-suite/cases/semantic/00023/00023-model.m 2009-03-17 23:17:50 UTC (rev 9407)
+++ trunk/test-suite/cases/semantic/00023/00023-model.m 2009-03-17 23:19:37 UTC (rev 9408)
@@ -23,13 +23,13 @@
The initial conditions are as follows:
[{width:30em,margin-left:5em}| |*Value* |*Units* |
-|Initial amount of S1 |$1.0 \x 10^-15$ |mole |
-|Initial amount of S2 |$2.0 \x 10^-15$ |mole |
+|Initial amount of S1 |$1.0 \x 10^-1$ |mole |
+|Initial amount of S2 |$2.0 \x 10^-1$ |mole |
|Initial amount of S3 |$0$ |mole |
|Initial amount of S4 |$0$ |mole |
|Value of parameter k1 |$0.75$ |second^-1^ |
|Value of parameter k2 |$0.25$ |second^-1^ |
-|Value of parameter k3 |$0.15$ |second^-1^ |
+|Value of parameter k3 |$0.1$ |second^-1^ |
|Value of parameter k4 |$0.1$ |litre mole^-1^ second^-1^ |
|Volume of compartment "compartment" |$1$ |litre |]
@@ -43,14 +43,14 @@
newcase[ "00023" ];
addCompartment[ compartment, size -> 1 ];
-addSpecies[ S1, initialAmount -> 1.0 10^-15];
-addSpecies[ S2, initialAmount -> 2.0 10^-15,constant-> True,
+addSpecies[ S1, initialAmount -> 1.0 10^-1];
+addSpecies[ S2, initialAmount -> 2.0 10^-1,constant-> True,
boundaryCondition->True];
addSpecies[ S3, initialAmount -> 0];
addSpecies[ S4, initialAmount -> 0];
addParameter[ k1, value -> 0.75 ];
addParameter[ k2, value -> 0.25 ];
-addParameter[ k3, value -> 0.15 ];
+addParameter[ k3, value -> 0.1 ];
addParameter[ k4, value -> 0.1 ];
addReaction[ S1 -> S2, reversible -> False,
kineticLaw -> k1 * S1 * compartment ];
Modified: trunk/test-suite/cases/semantic/00023/00023-plot.eps
===================================================================
--- trunk/test-suite/cases/semantic/00023/00023-plot.eps 2009-03-17 23:17:50 UTC (rev 9407)
+++ trunk/test-suite/cases/semantic/00023/00023-plot.eps 2009-03-17 23:19:37 UTC (rev 9408)
@@ -1,2234 +1,43 @@
-%!PS-Adobe-2.0 EPSF-1.2
-%%BoundingBox: 88 4 376 144
-%%HiResBoundingBox: 88 4 376 143.562
-%%Creator: (Mathematica 5.2 for X)
-%%CreationDate: (Monday, August 20, 2007) (12:00:52)
-%%Title: Clipboard
-%%DocumentNeededResources: font Math1Mono
-%%+ font Courier
-%%DocumentSuppliedResources:
-%%DocumentNeededFonts: Math1Mono
-%%+ Courier
-%%DocumentSuppliedFonts:
-%%DocumentFonts: Math1Mono
-%%+ Courier
-%%EndComments
-0 147.562 translate 1 -1 scale
-150 dict begin
-/Mfixwid true def
-/Mrot 0 def
-/Mpstart {
- MathPictureStart
-} bind def
-/Mpend {
- MathPictureEnd
-} bind def
-/Mscale {
- 0 1 0 1
- 5 -1 roll
- MathScale
-} bind def
-/Plain /Courier findfont def
-/Bold /Courier-Bold findfont def
-/Italic /Courier-Oblique findfont def
-/MathPictureStart {
- /Mimatrix
- matrix currentmatrix
- def
- gsave
- newpath
- Mleft
- Mbottom
- translate
- /Mtmatrix
- matrix currentmatrix
- def
- Plain
- Mfontsize scalefont
- setfont
- 0 setgray
- 0 setlinewidth
-} bind def
-/MathPictureEnd {
- grestore
-} bind def
-/MathSubStart {
- Momatrix
- Mgmatrix Mtmatrix
- Mleft Mbottom
- Mwidth Mheight
- 9 -2 roll
- moveto
- Mtmatrix setmatrix
- currentpoint
- Mgmatrix setmatrix
- 11 -2 roll
- moveto
- Mtmatrix setmatrix
- currentpoint
- 2 copy translate
- /Mtmatrix matrix currentmatrix def
- /Mleft 0 def
- /Mbottom 0 def
- 3 -1 roll
- exch sub
- /Mheight exch def
- sub
- /Mwidth exch def
-} bind def
-/MathSubEnd {
- /Mheight exch def
- /Mwidth exch def
- /Mbottom exch def
- /Mleft exch def
- /Mtmatrix exch def
- dup setmatrix
- /Mgmatrix exch def
- /Momatrix exch def
-} bind def
-/Mdot {
- moveto
- 0 0 rlineto
- stroke
-} bind def
-/Mtetra {
- moveto
- lineto
- lineto
- lineto
- fill
-} bind def
-/Metetra {
- moveto
- lineto
- lineto
- lineto
- closepath
- gsave
- fill
- grestore
- 0 setgray
- stroke
-} bind def
-/Mistroke {
- flattenpath
- 0 0 0
- {
- 4 2 roll
- pop pop
- }
- {
- 4 -1 roll
- 2 index
- sub dup mul
- 4 -1 roll
- 2 index
- sub dup mul
- add sqrt
- 4 -1 roll
- add
- 3 1 roll
- }
- {
- stop
- }
- {
- stop
- }
- pathforall
- pop pop
- currentpoint
- stroke
- moveto
- currentdash
- 3 -1 roll
- add
- setdash
-} bind def
-/Mfstroke {
- stroke
- currentdash
- pop 0
- setdash
-} bind def
-/Mrotsboxa {
- gsave
- dup
- /Mrot
- exch def
- Mrotcheck
- Mtmatrix
- dup
- setmatrix
- 7 1 roll
- 4 index
- 4 index
- translate
- rotate
- 3 index
- -1 mul
- 3 index
- -1 mul
- translate
- /Mtmatrix
- matrix
- currentmatrix
- def
- grestore
- Msboxa
- 3 -1 roll
- /Mtmatrix
- exch def
- /Mrot
- 0 def
-} bind def
-/Msboxa {
- newpath
- 5 -1 roll
- Mvboxa
- pop
- Mboxout
- 6 -1 roll
- 5 -1 roll
- 4 -1 roll
- Msboxa1
- 5 -3 roll
- Msboxa1
- Mboxrot
- [
- 7 -2 roll
- 2 copy
- [
- 3 1 roll
- 10 -1 roll
- 9 -1 roll
- ]
- 6 1 roll
- 5 -2 roll
- ]
-} bind def
-/Msboxa1 {
- sub
- 2 div
- dup
- 2 index
- 1 add
- mul
- 3 -1 roll
- -1 add
- 3 -1 roll
- mul
-} bind def
-/Mvboxa {
- Mfixwid
- {
- Mvboxa1
- }
- {
- dup
- Mwidthcal
- 0 exch
- {
- add
- }
- forall
- exch
- Mvboxa1
- 4 index
- 7 -1 roll
- add
- 4 -1 roll
- pop
- 3 1 roll
- }
- ifelse
-} bind def
-/Mvboxa1 {
- gsave
- newpath
- [ true
- 3 -1 roll
- {
- Mbbox
- 5 -1 roll
- {
- 0
- 5 1 roll
- }
- {
- 7 -1 roll
- exch sub
- (m) stringwidth pop
- .3 mul
- sub
- 7 1 roll
- 6 -1 roll
- 4 -1 roll
- Mmin
- 3 -1 roll
- 5 index
- add
- 5 -1 roll
- 4 -1 roll
- Mmax
- 4 -1 roll
- }
- ifelse
- false
- }
- forall
- { stop } if
- counttomark
- 1 add
- 4 roll
- ]
- grestore
-} bind def
-/Mbbox {
- 0 0 moveto
- false charpath
- flattenpath
- pathbbox
- newpath
-} bind def
-/Mmin {
- 2 copy
- gt
- { exch } if
- pop
-} bind def
-/Mmax {
- 2 copy
- lt
- { exch } if
- pop
-} bind def
-/Mrotshowa {
- dup
- /Mrot
- exch def
- Mrotcheck
- Mtmatrix
- dup
- setmatrix
- 7 1 roll
- 4 index
- 4 index
- translate
- rotate
- 3 index
- -1 mul
- 3 index
- -1 mul
- translate
- /Mtmatrix
- matrix
- currentmatrix
- def
- Mgmatrix setmatrix
- Mshowa
- /Mtmatrix
- exch def
- /Mrot 0 def
-} bind def
-/Mshowa {
- 4 -2 roll
- moveto
- 2 index
- Mtmatrix setmatrix
- Mvboxa
- 7 1 roll
- Mboxout
- 6 -1 roll
- 5 -1 roll
- 4 -1 roll
- Mshowa1
- 4 1 roll
- Mshowa1
- rmoveto
- currentpoint
- Mfixwid
- {
- Mshowax
- }
- {
- Mshoway
- }
- ifelse
- pop pop pop pop
- Mgmatrix setmatrix
-} bind def
-/Mshowax {
- 0 1
- 4 index length
- -1 add
- {
- 2 index
- 4 index
- 2 index
- get
- 3 index
- add
- moveto
- 4 index
- exch get
- show
- } for
-} bind def
-/Mshoway {
- 3 index
- Mwidthcal
- 5 1 roll
- 0 1
- 4 index length
- -1 add
- {
- 2 index
- 4 index
- 2 index
- get
- 3 index
- add
- moveto
- 4 index
- exch get
- [
- 6 index
- aload
- length
- 2 add
- -1 roll
- {
- pop
- Strform
- stringwidth
- pop
- neg
- exch
- add
- 0 rmoveto
- }
- exch
- kshow
- cleartomark
- } for
- pop
-} bind def
-/Mwidthcal {
- [
- exch
- {
- Mwidthcal1
- }
- forall
- ]
- [
- exch
- dup
- Maxlen
- -1 add
- 0 1
- 3 -1 roll
- {
- [
- exch
- 2 index
- {
- 1 index
- Mget
- exch
- }
- forall
- pop
- Maxget
- exch
- }
- for
- pop
- ]
- Mreva
-} bind def
-/Mreva {
- [
- exch
- aload
- length
- -1 1
- {1 roll}
- for
- ]
-} bind def
-/Mget {
- 1 index
- length
- -1 add
- 1 index
- ge
- {
- get
- }
- {
- pop pop
- 0
- }
- ifelse
-} bind def
-/Maxlen {
- [
- exch
- {
- length
- }
- forall
- Maxget
-} bind def
-/Maxget {
- counttomark
- -1 add
- 1 1
- 3 -1 roll
- {
- pop
- Mmax
- }
- for
- exch
- pop
-} bind def
-/Mwidthcal1 {
- [
- exch
- {
- Strform
- stringwidth
- pop
- }
- forall
- ]
-} bind def
-/Strform {
- /tem (x) def
- tem 0
- 3 -1 roll
- put
- tem
-} bind def
-/Mshowa1 {
- 2 copy
- add
- 4 1 roll
- sub
- mul
- sub
- -2 div
-} bind def
-/MathScale {
- Mwidth
- Mheight
- Mlp
- translate
- scale
- /yscale exch def
- /ybias exch def
- /xscale exch def
- /xbias exch def
- /Momatrix
- xscale yscale matrix scale
- xbias ybias matrix translate
- matrix concatmatrix def
- /Mgmatrix
- matrix currentmatrix
- def
-} bind def
-/Mlp {
- 3 copy
- Mlpfirst
- {
- Mnodistort
- {
- Mmin
- dup
- } if
- 4 index
- 2 index
- 2 index
- Mlprun
- 11 index
- 11 -1 roll
- 10 -4 roll
- Mlp1
- 8 index
- 9 -5 roll
- Mlp1
- 4 -1 roll
- and
- { exit } if
- 3 -1 roll
- pop pop
- } loop
- exch
- 3 1 roll
- 7 -3 roll
- pop pop pop
-} bind def
-/Mlpfirst {
- 3 -1 roll
- dup length
- 2 copy
- -2 add
- get
- aload
- pop pop pop
- 4 -2 roll
- -1 add
- get
- aload
- pop pop pop
- 6 -1 roll
- 3 -1 roll
- 5 -1 roll
- sub
- dup /MsaveAx exch def
- div
- 4 1 roll
- exch sub
- dup /MsaveAy exch def
- div
-} bind def
-/Mlprun {
- 2 copy
- 4 index
- 0 get
- dup
- 4 1 roll
- Mlprun1
- 3 copy
- 8 -2 roll
- 9 -1 roll
- {
- 3 copy
- Mlprun1
- 3 copy
- 11 -3 roll
- /gt Mlpminmax
- 8 3 roll
- 11 -3 roll
- /lt Mlpminmax
- 8 3 roll
- } forall
- pop pop pop pop
- 3 1 roll
- pop pop
- aload pop
- 5 -1 roll
- aload pop
- exch
- 6 -1 roll
- Mlprun2
- 8 2 roll
- 4 -1 roll
- Mlprun2
- 6 2 roll
- 3 -1 roll
- Mlprun2
- 4 2 roll
- exch
- Mlprun2
- 6 2 roll
-} bind def
-/Mlprun1 {
- aload pop
- exch
- 6 -1 roll
- 5 -1 roll
- mul add
- 4 -2 roll
- mul
- 3 -1 roll
- add
-} bind def
-/Mlprun2 {
- 2 copy
- add 2 div
- 3 1 roll
- exch sub
-} bind def
-/Mlpminmax {
- cvx
- 2 index
- 6 index
- 2 index
- exec
- {
- 7 -3 roll
- 4 -1 roll
- } if
- 1 index
- 5 index
- 3 -1 roll
- exec
- {
- 4 1 roll
- pop
- 5 -1 roll
- aload
- pop pop
- 4 -1 roll
- aload pop
- [
- 8 -2 roll
- pop
- 5 -2 roll
- pop
- 6 -2 roll
- pop
- 5 -1 roll
- ]
- 4 1 roll
- pop
- }
- {
- pop pop pop
- } ifelse
-} bind def
-/Mlp1 {
- 5 index
- 3 index sub
- 5 index
- 2 index mul
- 1 index
- le
- 1 index
- 0 le
- or
- dup
- not
- {
- 1 index
- 3 index div
- .99999 mul
- 8 -1 roll
- pop
- 7 1 roll
- }
- if
- 8 -1 roll
- 2 div
- 7 -2 roll
- pop sub
- 5 index
- 6 -3 roll
- pop pop
- mul sub
- exch
-} bind def
-/intop 0 def
-/inrht 0 def
-/inflag 0 def
-/outflag 0 def
-/xadrht 0 def
-/xadlft 0 def
-/yadtop 0 def
-/yadbot 0 def
-/Minner {
- outflag
- 1
- eq
- {
- /outflag 0 def
- /intop 0 def
- /inrht 0 def
- } if
- 5 index
- gsave
- Mtmatrix setmatrix
- Mvboxa pop
- grestore
- 3 -1 roll
- pop
- dup
- intop
- gt
- {
- /intop
- exch def
- }
- { pop }
- ifelse
- dup
- inrht
- gt
- {
- /inrht
- exch def
- }
- { pop }
- ifelse
- pop
- /inflag
- 1 def
-} bind def
-/Mouter {
- /xadrht 0 def
- /xadlft 0 def
- /yadtop 0 def
- /yadbot 0 def
- inflag
- 1 eq
- {
- dup
- 0 lt
- {
- dup
- intop
- mul
- neg
- /yadtop
- exch def
- } if
- dup
- 0 gt
- {
- dup
- intop
- mul
- /yadbot
- exch def
- }
- if
- pop
- dup
- 0 lt
- {
- dup
- inrht
- mul
- neg
- /xadrht
- exch def
- } if
- dup
- 0 gt
- {
- dup
- inrht
- mul
- /xadlft
- exch def
- } if
- pop
- /outflag 1 def
- }
- { pop pop}
- ifelse
- /inflag 0 def
- /inrht 0 def
- /intop 0 def
-} bind def
-/Mboxout {
- outflag
- 1
- eq
- {
- 4 -1
- roll
- xadlft
- leadjust
- add
- sub
- 4 1 roll
- 3 -1
- roll
- yadbot
- leadjust
- add
- sub
- 3 1
- roll
- exch
- xadrht
- leadjust
- add
- add
- exch
- yadtop
- leadjust
- add
- add
- /outflag 0 def
- /xadlft 0 def
- /yadbot 0 def
- /xadrht 0 def
- /yadtop 0 def
- } if
-} bind def
-/leadjust {
- (m) stringwidth pop
- .5 mul
-} bind def
-/Mrotcheck {
- dup
- 90
- eq
- {
- yadbot
- /yadbot
- xadrht
- def
- /xadrht
- yadtop
- def
- /yadtop
- xadlft
- def
- /xadlft
- exch
- def
- }
- if
- dup
- cos
- 1 index
- sin
- Checkaux
- dup
- cos
- 1 index
- sin neg
- exch
- Checkaux
- 3 1 roll
- pop pop
-} bind def
-/Checkaux {
- 4 index
- exch
- 4 index
- mul
- 3 1 roll
- mul add
- 4 1 roll
-} bind def
-/Mboxrot {
- Mrot
- 90 eq
- {
- brotaux
- 4 2
- roll
- }
- if
- Mrot
- 180 eq
- {
- 4 2
- roll
- brotaux
- 4 2
- roll
- brotaux
- }
- if
- Mrot
- 270 eq
- {
- 4 2
- roll
- brotaux
- }
- if
-} bind def
-/brotaux {
- neg
- exch
- neg
-} bind def
-/Mabsproc {
- 0
- matrix defaultmatrix
- dtransform idtransform
- dup mul exch
- dup mul
- add sqrt
-} bind def
-/Mabswid {
- Mabsproc
- setlinewidth
-} bind def
-/Mabsdash {
- exch
- [
- exch
- {
- Mabsproc
- }
- forall
- ]
- exch
- setdash
-} bind def
-/MBeginOrig { Momatrix concat} bind def
-/MEndOrig { Mgmatrix setmatrix} bind def
-/sampledsound where
-{ pop}
-{ /sampledsound {
-exch
-pop
-exch
-5 1 roll
-mul
-4 idiv
-mul
-2 idiv
-exch pop
-exch
-/Mtempproc exch def
-{ Mtempproc pop }
-repeat
-} bind def
-} ifelse
-
-/MFill {
- 0 0 moveto
- Mwidth 0 lineto
- Mwidth Mheight lineto
- 0 Mheight lineto
- fill
-} bind def
-
-/MPlotRegion {
- 3 index
- Mwidth mul
- 2 index
- Mheight mul
- translate
- exch sub
- Mheight mul
- /Mheight
- exch def
- exch sub
- Mwidth mul
- /Mwidth
- exch def
-} bind def
-
-/Mcharproc
-{
- currentfile
- (x)
- readhexstring
- pop
- 0 get
- exch
- div
-} bind def
-
-/Mshadeproc
-{
- dup
- 3 1
- roll
- {
- dup
- Mcharproc
- 3 1
- roll
- } repeat
- 1 eq
- {
- setgray
- }
- {
- 3 eq
- {
- setrgbcolor
- }
- {
- setcmykcolor
- } ifelse
- } ifelse
-} bind def
-
-/Mrectproc
-{
- 3 index
- 2 index
- moveto
- 2 index
- 3 -1
- roll
- lineto
- dup
- 3 1
- roll
- lineto
- lineto
- fill
-} bind def
-
-/_Mcolorimage
-{
- 7 1
- roll
- pop
- pop
- matrix
- invertmatrix
- concat
- 2 exch exp
- 1 sub
- 3 1 roll
- 1 1
- 2 index
- {
- 1 1
- 4 index
- {
- dup
- 1 sub
- exch
- 2 index
- dup
- 1 sub
- exch
- 7 index
- 9 index
- Mshadeproc
- Mrectproc
- } for
- pop
- } for
- pop pop pop pop
-} bind def
-
-/_Mimage
-{
- pop
- matrix
- invertmatrix
- concat
- 2 exch exp
- 1 sub
- 3 1 roll
- 1 1
- 2 index
- {
- 1 1
- 4 index
- {
- dup
- 1 sub
- exch
- 2 index
- dup
- 1 sub
- exch
- 7 index
- Mcharproc
- setgray
- Mrectproc
- } for
- pop
- } for
- pop pop pop
-} bind def
-
-/Mimage {
- 4 index
- 4 index
- mul 1600 gt
- { image }
- { _Mimage }
- ifelse
-} def
-
-/Mcolorimage {
- 6 index
- 6 index
- mul 1600 gt
- { colorimage }
- { _Mcolorimage }
- ifelse
-} def
-
-/g { setgray} bind def
-/k { setcmykcolor} bind def
-/p { gsave} bind def
-/r { setrgbcolor} bind def
-/w { setlinewidth} bind def
-/C { curveto} bind def
-/F { fill} bind def
-/L { lineto} bind def
-/rL { rlineto} bind def
-/P { grestore} bind def
-/s { stroke} bind def
-/S { show} bind def
-/N {currentpoint 3 -1 roll show moveto} bind def
-/Msf { findfont exch scalefont [1 0 0 -1 0 0 ] makefont setfont} bind def
-/m { moveto} bind def
-/Mr { rmoveto} bind def
-/Mx {currentpoint exch pop moveto} bind def
-/My {currentpoint pop exch moveto} bind def
-/X {0 rmoveto} bind def
-/Y {0 exch rmoveto} bind def
-gsave
-newpath
- 143.312 112.438 moveto
- 277.500 112.438 lineto
- 277.500 29.562 lineto
- 143.312 29.562 lineto
- 143.312 112.438 lineto
-closepath
-clip newpath
-grestore
-gsave
-newpath
- 308.875 126.625 moveto
- 362.250 126.625 lineto
- 362.250 19.875 lineto
- 308.875 19.875 lineto
- 308.875 126.625 lineto
-closepath
-clip newpath
-grestore
-gsave
-newpath
- 311.688 116.500 moveto
- 327.562 116.500 lineto
- 327.562 106.688 lineto
- 311.688 106.688 lineto
- 311.688 116.500 lineto
-closepath
-clip newpath
-grestore
-gsave
-newpath
- 308.875 126.625 moveto
- 362.250 126.625 lineto
- 362.250 19.875 lineto
- 308.875 19.875 lineto
- 308.875 126.625 lineto
-closepath
-clip newpath
-grestore
-gsave
-newpath
- 308.875 126.625 moveto
- 362.250 126.625 lineto
- 362.250 19.875 lineto
- 308.875 19.875 lineto
- 308.875 126.625 lineto
-closepath
-clip newpath
-grestore
-gsave
-newpath
- 311.688 90.938 moveto
- 327.562 90.938 lineto
- 327.562 81.125 lineto
- 311.688 81.125 lineto
- 311.688 90.938 lineto
-closepath
-clip newpath
-grestore
-gsave
-newpath
- 308.875 126.625 moveto
- 362.250 126.625 lineto
- 362.250 19.875 lineto
- 308.875 19.875 lineto
- 308.875 126.625 lineto
-closepath
-clip newpath
-grestore
-gsave
-newpath
- 308.875 126.625 moveto
- 362.250 126.625 lineto
- 362.250 19.875 lineto
- 308.875 19.875 lineto
- 308.875 126.625 lineto
-closepath
-clip newpath
-grestore
-gsave
-newpath
- 311.688 65.312 moveto
- 327.562 65.312 lineto
- 327.562 55.500 lineto
- 311.688 55.500 lineto
- 311.688 65.312 lineto
-closepath
-clip newpath
-grestore
-gsave
-newpath
- 308.875 126.625 moveto
- 362.250 126.625 lineto
- 362.250 19.875 lineto
- 308.875 19.875 lineto
- 308.875 126.625 lineto
-closepath
-clip newpath
-grestore
-gsave
-newpath
- 308.875 126.625 moveto
- 362.250 126.625 lineto
- 362.250 19.875 lineto
- 308.875 19.875 lineto
- 308.875 126.625 lineto
-closepath
-clip newpath
-grestore
-gsave
-newpath
- 311.688 39.750 moveto
- 327.562 39.750 lineto
- 327.562 29.938 lineto
- 311.688 29.938 lineto
- 311.688 39.750 lineto
-closepath
-clip newpath
-grestore
-gsave
-newpath
- 308.875 126.625 moveto
- 362.250 126.625 lineto
- 362.250 19.875 lineto
- 308.875 19.875 lineto
- 308.875 126.625 lineto
-closepath
-clip newpath
-grestore
-gsave
-newpath
- 308.875 126.625 moveto
- 362.250 126.625 lineto
- 362.250 19.875 lineto
- 308.875 19.875 lineto
- 308.875 126.625 lineto
-closepath
-clip newpath
-grestore
-gsave
-newpath
- 88.562 142.562 moveto
- 374.375 142.562 lineto
- 374.375 4.000 lineto
- 88.562 4.000 lineto
- 88.562 142.562 lineto
-closepath
-clip newpath
-grestore
-/pp_save save def /showpage {} def
-
-gsave
-/MacintoshRomanEncoding [
- /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
- /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
- /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
- /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
- /space/exclam/quotedbl/numbersign/dollar/percent/ampersand/quotesingle
- /parenleft/parenright/asterisk/plus/comma/hyphen/period/slash
- /zero/one/two/three/four/five/six/seven
- /eight/nine/colon/semicolon/less/equal/greater/question
- /at/A/B/C/D/E/F/G
- /H/I/J/K/L/M/N/O
- /P/Q/R/S/T/U/V/W
- /X/Y/Z/bracketleft/backslash/bracketright/asciicircum/underscore
- /grave/a/b/c/d/e/f/g
- /h/i/j/k/l/m/n/o
- /p/q/r/s/t/u/v/w
- /x/y/z/braceleft/bar/braceright/asciitilde/.notdef
- /Adieresis/Aring/Ccedilla/Eacute/Ntilde/Odieresis/Udieresis/aacute
- /agrave/acircumflex/adieresis/atilde/aring/ccedilla/eacute/egrave
- /ecircumflex/edieresis/iacute/igrave/icircumflex/idieresis/ntilde/oacute
- /ograve/ocircumflex/odieresis/otilde/uacute/ugrave/ucircumflex/udieresis
- /dagger/degree/cent/sterling/section/bullet/paragraph/germandbls
- /registered/copyright/trademark/acute/dieresis/.notdef/AE/Oslash
- /.notdef/plusminus/.notdef/.notdef/yen/.notdef/.notdef/.notdef
- /.notdef/.notdef/.notdef/ordfeminine/ring/.notdef/ae/oslash
- /questiondown/exclamdown/logicalnot/.notdef/florin/.notdef/.notdef/guillemotleft
- /guillemotright/ellipsis/.notdef/Agrave/Atilde/Otilde/OE/oe
- /endash/emdash/quotedblleft/quotedblright/quoteleft/quoteright/divide/.notdef
- /ydieresis/Ydieresis/.notdef/currency/guilsinglleft/guilsinglright/.notdef/.notdef
- /daggerdbl/dotaccent/quotesinglbase/quotedblbase/perthousand/Acircumflex/Ecircumflex/Aacute
- /Edieresis/Egrave/Iacute/Icircumflex/Idieresis/Igrave/Oacute/Ocircumflex
- /.notdef/Ograve/Uacute/Ucircumflex/Ugrave/dotlessi/circumflex/tilde
- /macron/.notdef/.notdef/.notdef/ogonek/.notdef/.notdef/.notdef
-] def
-/WindowsANSIEncoding [
- /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
- /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
- /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
- /.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
- /space/exclam/quotedbl/numbersign/dollar/percent/ampersand/quotesingle
- /parenleft/parenright/asterisk/plus/comma/hyphen/period/slash
- /zero/one/two/three/four/five/six/seven
- /eight/nine/colon/semicolon/less/equal/greater/question
- /at/A/B/C/D/E/F/G
- /H/I/J/K/L/M/N/O
- /P/Q/R/S/T/U/V/W
- /X/Y/Z/bracketleft/backslash/bracketright/asciicircum/underscore
- /grave/a/b/c/d/e/f/g
- /h/i/j/k/l/m/n/o
- /p/q/r/s/t/u/v/w
- /x/y/z/braceleft/bar/braceright/asciitilde/.notdef
- /.notdef/.notdef/quotesinglbase/florin/quotedblbase/ellipsis/dagger/daggerdbl
- /circumflex/perthousand/Scaron/guilsinglleft/OE/.notdef/Zcaron/.notdef
- /.notdef/quoteleft/quoteright/quotedblleft/quotedblright/bullet/endash/emdash
- /tilde/trademark/scaron/guilsinglright/oe/.notdef/zcaron/Ydieresis
- /.notdef/exclamdown/cent/sterling/currency/yen/brokenbar/section
- /dieresis/copyright/ordfeminine/guillemotleft/logicalnot/hyphen/registered/macron
- /degree/plusminus/twosuperior/threesuperior/acute/mu/paragraph/dotaccent
- /ogonek/onesuperior/ring/guillemotright/onequarter/onehalf/threequarters/questiondown
- /Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla
- /Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute/Icircumflex/Idieresis
- /Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde/Odieresis/multiply
- /Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn/germandbls
- /agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla
- /egrave/eacute/ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis
- /eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis/divide
- /oslash/ugrave/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis
-] def
-/Mnodistort true def
-1.000000 1.000000 scale
-88.000000 143.562500 translate
-1.000000 -1.000000 scale
--0.000000 -0.000000 translate
-/Mleft 0.000000 def
-/Mbottom 0.000000 def
-/Mwidth 288.000000 def
-/Mheight 139.562500 def
-0 setgray
-0 setlinewidth
-/Courier findfont 12 scalefont setfont
-/Mfontsize 12 def
-/Plain /Courier findfont def
-
-%!
-%%Creator: Mathematica
-%%AspectRatio: .48473
-MathPictureStart
-/Mabs {
-Mgmatrix idtransform
-Mtmatrix dtransform
-} bind def
-/Mabsadd { Mabs
-3 -1 roll add
-3 1 roll add
-exch } bind def
-%% Graphics
-%%IncludeResource: font Courier
-%%IncludeFont: Courier
-/Courier findfont 10 scalefont setfont
-% Scaling calculations
-0.397292 0.373483 0.242366 0.373483 [
-[ 0 0 0 0 ]
-[ 1 .48473 0 0 ]
-] MathScale
-% Start of Graphics
-1 setlinecap
-1 setlinejoin
-newpath
-% Start of sub-graphic
-p
-0.0238095 0.0115413 0.770775 0.473191 MathSubStart
-%% Graphics
-%%IncludeResource: font Courier
-%%IncludeFont: Courier
-/Courier findfont 10 scalefont setfont
-% Scaling calculations
-0.0238095 0.190476 0.0147151 2.94302e+14 [
-[.21429 .00222 -3 -9 ]
-[.21429 .00222 3 0 ]
-[.40476 .00222 -3 -9 ]
-[.40476 .00222 3 0 ]
-[.59524 .00222 -3 -9 ]
-[.59524 .00222 3 0 ]
-[.78571 .00222 -3 -9 ]
-[.78571 .00222 3 0 ]
-[.97619 .00222 -3 -9 ]
-[.97619 .00222 3 0 ]
-[1.025 .01472 0 -5.0625 ]
-[1.025 .01472 28 5.0625 ]
-[.01131 .16187 -37.5 -6.25 ]
-[.01131 .16187 0 6.25 ]
-[.01131 .30902 -37.5 -6.25 ]
-[.01131 .30902 0 6.25 ]
-[.01131 .45617 -49.5 -6.25 ]
-[.01131 .45617 0 6.25 ]
-[.01131 .60332 -37.5 -6.25 ]
-[.01131 .60332 0 6.25 ]
-[ 0 0 0 0 ]
-[ 1 .61803 0 0 ]
-] MathScale
-% Start of Graphics
-1 setlinecap
-1 setlinejoin
-newpath
-0 g
-.25 Mabswid
-[ ] 0 setdash
-.21429 .01472 m
-.21429 .02097 L
-s
-[(1)] .21429 .00222 0 1 Mshowa
-.40476 .01472 m
-.40476 .02097 L
-s
-[(2)] .40476 .00222 0 1 Mshowa
-.59524 .01472 m
-.59524 .02097 L
-s
-[(3)] .59524 .00222 0 1 Mshowa
-.78571 .01472 m
-.78571 .02097 L
-s
-[(4)] .78571 .00222 0 1 Mshowa
-.97619 .01472 m
-.97619 .02097 L
-s
-[(5)] .97619 .00222 0 1 Mshowa
-.125 Mabswid
-.0619 .01472 m
-.0619 .01847 L
-s
-.1 .01472 m
-.1 .01847 L
-s
-.1381 .01472 m
-.1381 .01847 L
-s
-.17619 .01472 m
-.17619 .01847 L
-s
-.25238 .01472 m
-.25238 .01847 L
-s
-.29048 .01472 m
-.29048 .01847 L
-s
-.32857 .01472 m
-.32857 .01847 L
-s
-.36667 .01472 m
-.36667 .01847 L
-s
-.44286 .01472 m
-.44286 .01847 L
-s
-.48095 .01472 m
-.48095 .01847 L
-s
-.51905 .01472 m
-.51905 .01847 L
-s
-.55714 .01472 m
-.55714 .01847 L
-s
-.63333 .01472 m
-.63333 .01847 L
-s
-.67143 .01472 m
-.67143 .01847 L
-s
-.70952 .01472 m
-.70952 .01847 L
-s
-.74762 .01472 m
-.74762 .01847 L
-s
-.82381 .01472 m
-.82381 .01847 L
-s
-.8619 .01472 m
-.8619 .01847 L
-s
-.9 .01472 m
-.9 .01847 L
-s
-.9381 .01472 m
-.9381 .01847 L
-s
-.25 Mabswid
-0 .01472 m
-1 .01472 L
-s
-gsave
-1.025 .01472 -61 -9.0625 Mabsadd m
-1 1 Mabs scale
-currentpoint translate
-0 18.125 translate 1 -1 scale
-/g { setgray} bind def
-/k { setcmykcolor} bind def
-/p { gsave} bind def
-/r { setrgbcolor} bind def
-/w { setlinewidth} bind def
-/C { curveto} bind def
-/F { fill} bind def
-/L { lineto} bind def
-/rL { rlineto} bind def
-/P { grestore} bind def
-/s { stroke} bind def
-/S { show} bind def
-/N {currentpoint 3 -1 roll show moveto} bind def
-/Msf { findfont exch scalefont [1 0 0 -1 0 0 ] makefont setfont} bind def
-/m { moveto} bind def
-/Mr { rmoveto} bind def
-/Mx {currentpoint exch pop moveto} bind def
-/My {currentpoint pop exch moveto} bind def
-/X {0 rmoveto} bind def
-/Y {0 exch rmoveto} bind def
-63.000 11.562 moveto
-%%IncludeResource: font Courier
-%%IncludeFont: Courier
-/Courier findfont 10.000 scalefont
-[1 0 0 -1 0 0 ] makefont setfont
-0.000 0.000 0.000 setrgbcolor
-0.000 0.000 rmoveto
-63.000 11.562 moveto
-%%IncludeResource: font Courier
-%%IncludeFont: Courier
-/Courier findfont 10.000 scalefont
-[1 0 0 -1 0 0 ] makefont setfont
-0.000 0.000 0.000 setrgbcolor
-(Time) show
-87.000 11.562 moveto
-%%IncludeResource: font Courier
-%%IncludeFont: Courier
-/Courier findfont 10.000 scalefont
-[1 0 0 -1 0 0 ] makefont setfont
-0.000 0.000 0.000 setrgbcolor
-0.000 0.000 rmoveto
-1.000 setlinewidth
-grestore
-.02381 .16187 m
-.03006 .16187 L
-s
-gsave
-.01131 .16187 -37.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(5) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-16) show
-grestore
-.02381 .30902 m
-.03006 .30902 L
-s
-gsave
-.01131 .30902 -37.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(1) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
-.02381 .45617 m
-.03006 .45617 L
-s
-gsave
-.01131 .45617 -49.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(1.5) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
-.02381 .60332 m
-.03006 .60332 L
-s
-gsave
-.01131 .60332 -37.5 -4.25 Mabsadd m
-1 1 Mabs scale
-/Courier findfont 10 scalefont setfont
-(2) show
-/Math1Mono findfont 10 scalefont setfont
-(\264) show
-/Courier findfont 10 scalefont setfont
-(10) show
-0 5.25 rmoveto
-/Courier findfont 7.5 scalefont setfont
-(-15) show
-grestore
-.125 Mabswid
-.02381 .04415 m
-.02756 .04415 L
-s
-.02381 .07358 m
-.02756 .07358 L
-s
-.02381 .10301 m
-.02756 .10301 L
-s
-.02381 .13244 m
-.02756 .13244 L
-s
-.02381 .1913 m
-.02756 .1913 L
-s
-.02381 .22073 m
-.02756 .22073 L
-s
-.02381 .25016 m
-.02756 .25016 L
-s
-.02381 .27959 m
-.02756 .27959 L
-s
-.02381 .33845 m
-.02756 .33845 L
-s
-.02381 .36788 m
-.02756 .36788 L
-s
-.02381 .39731 m
-.02756 .39731 L
-s
-.02381 .42674 m
-.02756 .42674 L
-s
-.02381 .4856 m
-.02756 .4856 L
-s
-.02381 .51503 m
-.02756 .51503 L
-s
-.02381 .54446 m
-.02756 .54446 L
-s
-.02381 .57389 m
-.02756 .57389 L
-s
-.25 Mabswid
-.02381 0 m
-.02381 .61803 L
-s
-0 0 m
-1 0 L
-1 .61803 L
-0 .61803 L
-closepath
-clip
-newpath
-.5 1 0 r
-.5 Mabswid
-.02381 .30902 m
-.06244 .29517 L
-.10458 .28229 L
-.14415 .27199 L
-.18221 .26349 L
-.22272 .25574 L
-.26171 .24936 L
-.30316 .24357 L
-.34309 .23882 L
-.3815 .23491 L
-.42237 .23134 L
-.46172 .22841 L
-.49955 .22599 L
-.53984 .22378 L
-.57861 .22196 L
-.61984 .2203 L
-.65954 .21894 L
-.69774 .21782 L
-.73838 .2168 L
-.77751 .21596 L
-.81909 .2152 L
-.85916 .21457 L
-.89771 .21406 L
-.93871 .21359 L
-.97619 .21322 L
-s
-0 1 1 r
-.02381 .60332 m
-.06244 .60332 L
-.10458 .60332 L
-.14415 .60332 L
-.18221 .60332 L
-.22272 .60332 L
-.26171 .60332 L
-.30316 .60332 L
-.34309 .60332 L
-.3815 .60332 L
-.42237 .60332 L
-.46172 .60332 L
-.49955 .60332 L
-.53984 .60332 L
-.57861 .60332 L
-.61984 .60332 L
-.65954 .60332 L
-.69774 .60332 L
-.73838 .60332 L
-.77751 .60332 L
-.81909 .60332 L
-.85916 .60332 L
-.89771 .60332 L
-.93871 .60332 L
-.97619 .60332 L
-s
-.5 0 1 r
-.02381 .01472 m
-.06244 .03262 L
-.10458 .05215 L
-.14415 .0705 L
-.18221 .08814 L
-.22272 .10691 L
-.26171 .12499 L
-.30316 .1442 L
-.34309 .16271 L
-.3815 .18051 L
-.42237 .19946 L
-.46172 .2177 L
-.49955 .23523 L
-.53984 .25391 L
-.57861 .27188 L
-.61984 .29099 L
-.65954 .30939 L
-.69774 .3271 L
-.73838 .34594 L
-.77751 .36408 L
-.81909 .38335 L
-.85916 .40192 L
-.89771 .41979 L
-.93871 .4388 L
-.97619 .45617 L
-s
-1 0 0 r
-.02381 .01472 m
-.06244 .03262 L
-.10458 .05215 L
-.14415 .0705 L
-.18221 .08814 L
-.22272 .10691 L
-.26171 .12499 L
-.30316 .1442 L
-.34309 .16271 L
-.3815 .18051 L
-.42237 .19946 L
-.46172 .2177 L
-.49955 .23523 L
-.53984 .25391 L
-.57861 .27188 L
-.61984 .29099 L
-.65954 .30939 L
-.69774 .3271 L
-.73838 .34594 L
-.77751 .36408 L
-.81909 .38335 L
-.85916 .40192 L
-.89771 .41979 L
-.93871 .4388 L
-.97619 .45617 L
-s
-MathSubEnd
-P
-% End of sub-graphic
-0 g
-.78945 .03695 m
-.78945 .41043 L
-.97619 .41043 L
-.97619 .03695 L
-F
-1 g
-.77077 .05562 m
-.77077 .42911 L
-.95752 .42911 L
-.95752 .05562 L
-F
-0 g
-.001 w
-[ ] 0 setdash
-.77077 .05562 m
-.95752 .05562 L
-.95752 .42911 L
-.77077 .42911 L
-.77077 .05562 L
-s
-% Start of sub-graphic
-p
-0.770775 0.0556249 0.957516 0.429108 MathSubStart
-%% Graphics
-%%IncludeResource: font Courier
-%%IncludeFont: Courier
-/Courier findfont 10 scalefont setfont
-% Scaling calculations
-0.0297619 0.297619 0.0413223 0.413223 [
-[ 0 0 0 0 ]
-[ 1 2 0 0 ]
-] MathScale
-% Start of Graphics
-1 setlinecap
-1 setlinejoin
-newpath
-0 0 m
-1 0 L
-1 2 L
-0 2 L
-closepath
-clip
-newpath
-% Start of sub-graphic
-p
-0.0535714 0.0743802 0.35119 0.487603 MathSubStart
-%% Graphics
-%%IncludeResource: font Courier
-%%IncludeFont: Courier
-/Courier findfont 10 scalefont setfont
-% Scaling calculations
-0.0238095 0.952381 0.309017 0.294302 [
-[ 0 0 0 0 ]
-[ 1 .61803 0 0 ]
-] MathScale
-% Start of Graphics
-1 setlinecap
-1 setlinejoin
-newpath
-0 0 m
-1 0 L
-1 .61803 L
-0 .61803 L
-closepath
-clip
-newpath
-1 0 0 r
-.5 Mabswid
-[ ] 0 setdash
-.02381 .30902 m
-.97619 .30902 L
-s
-MathSubEnd
-P
-% End of sub-graphic
-0 g
-gsave
-.38988 .28099 -61 -8.90625 Mabsadd m
-1 1 Mabs scale
-currentpoint translate
-0 17.8125 translate 1 -1 scale
-/g { setgray} bind def
-/k { setcmykcolor} bind def
-/p { gsave} bind def
-/r { setrgbcolor} bind def
-/w { setlinewidth} bind def
-/C { curveto} bind def
-/F { fill} bind def
-/L { lineto} bind def
-/rL { rlineto} bind def
-/P { grestore} bind def
-/s { stroke} bind def
-/S { show} bind def
-/N {currentpoint 3 -1 roll show moveto} bind def
-/Msf { findfont exch scalefont [1 0 0 -1 0 0 ] makefont setfont} bind def
-/m { moveto} bind def
-/Mr { rmoveto} bind def
-/Mx {currentpoint exch pop moveto} bind def
-/My {currentpoint pop exch moveto} bind def
-/X {0 rmoveto} bind def
-/Y {0 exch rmoveto} bind def
-63.000 11.250 moveto
-%%IncludeResource: font Courier
-%%IncludeFont: Courier
-/Courier findfont 10.000 scalefont
-[1 0 0 -1 0 0 ] makefont setfont
-0.000 0.000 0.000 setrgbcolor
-0.000 0.000 rmoveto
-63.000 11.250 moveto
-%%IncludeResource: font Courier
-%%IncludeFont: Courier
-/Courier findfont 10.000 scalefont
-[1 0 0 -1 0 0 ] makefont setfont
-0.000 0.000 0.000 setrgbcolor
-(S4) show
-75.000 11.250 moveto
-%%IncludeResource: font Courier
-%%IncludeFont: Courier
-/Courier findfont 10.000 scalefont
-[1 0 0 -1 0 0 ] makefont setfont
-0.000 0.000 0.000 setrgbcolor
-0.000 0.000 rmoveto
-1.000 setlinewidth
-grestore
-% Start of sub-graphic
-p
-0.0535714 0.553719 0.35119 0.966942 MathSubStart
-%% Graphics
-%%IncludeResource: font Courier
-%%IncludeFont: Courier
-/Courier findfont 10 scalefont setfont
-% Scaling calculations
-0.0238095 0.952381 0.309017 0.294302 [
-[ 0 0 0 0 ]
-[ 1 .61803 0 0 ]
-] MathScale
-% Start of Graphics
-1 setlinecap
-1 setlinejoin
-newpath
-0 0 m
-1 0 L
-1 .61803 L
-0 .61803 L
-closepath
-clip
-newpath
-.5 0 1 r
-.5 Mabswid
-[ ] 0 setdash
-.02381 .30902 m
-.97619 .30902 L
-s
-MathSubEnd
-P
-% End of sub-graphic
-0 g
-gsave
-.38988 .76033 -61 -8.90625 Mabsadd m
-1 1 Mabs scale
-currentpoint translate
-0 17.8125 translate 1 -1 scale
-/g { setgray} bind def
-/k { setcmykcolor} bind def
-/p { gsave} bind def
-/r { setrgbcolor} bind def
-/w { setlinewidth} bind def
-/C { curveto} bind def
-/F { fill} bind def
-/L { lineto} bind def
-/rL { rlineto} bind def
-/P { grestore} bind def
-/s { stroke} bind def
-/S { show} bind def
-/N {currentpoint 3 -1 roll show moveto} bind def
-/Msf { findfont exch scalefont [1 0 0 -1 0 0 ] makefont setfont} bind def
-/m { moveto} bind def
-/Mr { rmoveto} bind def
-/Mx {currentpoint exch pop moveto} bind def
-/My {currentpoint pop exch moveto} bind def
-/X {0 rmoveto} bind def
-/Y {0 exch rmoveto} bind def
-63.000 11.250 moveto
-%%IncludeResource: font Courier
-%%IncludeFont: Courier
-/Courier findfont 10.000 scalefont
-[1 0 0 -1 0 0 ] makefont setfont
-0.000 0.000 0.000 setrgbcolor
-0.000 0.000 rmoveto
-63.000 11.250 moveto
-%%IncludeResource: font Courier
-%%IncludeFont: Courier
-/Courier findfont 10.000 scalefont
-[1 0 0 -1 0 0 ] makefont setfont
-0.000 0.000 0.000 setrgbcolor
-(S3) show
-75.000 11.250 moveto
-%%IncludeResource: font Courier
-%%IncludeFont: Courier
-/Courier findfont 10.000 scalefont
-[1 0 0 -1 0 0 ] makefont setfont
-0.000 0.000 0.000 setrgbcolor
-0.000 0.000 rmoveto
-1.000 setlinewidth
-grestore
-% Start of sub-graphic
-p
-0.0535714 1.03306 0.35119 1.44628 MathSubStart
-%% Graphics
-%%IncludeResource: font Courier
-%%IncludeFont: Courier
-/Courier findfont 10 scalefont setfont
-% Scaling calculations
-0.0238095 0.952381 0.309017 0.294302 [
-[ 0 0 0 0 ]
-[ 1 .61803 0 0 ]
-] MathScale
-% Start of Graphics
-1 setlinecap
-1 setlinejoin
-newpath
-0 0 m
-1 0 L
-1 .61803 L
-0 .61803 L
-closepath
-clip
-newpath
-0 1 1 r
-.5 Mabswid
-[ ] 0 setdash
-.02381 .30902 m
-.97619 .30902 L
-s
-MathSubEnd
-P
-% End of sub-graphic
-0 g
-gsave
-.38988 1.23967 -61 -8.90625 Mabsadd m
-1 1 Mabs scale
-currentpoint translate
-0 17.8125 translate 1 -1 scale
-/g { setgray} bind def
-/k { setcmykcolor} bind def
-/p { gsave} bind def
-/r { setrgbcolor} bind def
-/w { setlinewidth} bind def
-/C { curveto} bind def
-/F { fill} bind def
-/L { lineto} bind def
-/rL { rlineto} bind def
-/P { grestore} bind def
-/s { stroke} bind def
-/S { show} bind def
-/N {currentpoint 3 -1 roll show moveto} bind def
-/Msf { findfont exch scalefont [1 0 0 -1 0 0 ] makefont setfont} bind def
-/m { moveto} bind def
-/Mr { rmoveto} bind def
-/Mx {currentpoint exch pop moveto} bind def
-/My {currentpoint pop exch moveto} bind def
-/X {0 rmoveto} bind def
-/Y {0 exch rmoveto} bind def
-63.000 11.250 moveto
-%%IncludeResource: font Courier
-%%IncludeFont: Courier
-/Courier findfont 10.000 scalefont
-[1 0 0 -1 0 0 ] makefont setfont
-0.000 0.000 0.000 setrgbcolor
-0.000 0.000 rmoveto
-63.000 11.250 moveto
-%%IncludeResource: font Courier
-%%IncludeFont: Courier
-/Courier findfont 10.000 scalefont
-[1 0 0 -1 0 0 ] makefont setfont
-0.000 0.000 0.000 setrgbcolor
-(S2) show
-75.000 11.250 moveto
-%%IncludeResource: font Courier
-%%IncludeFont: Courier
-/Courier findfont 10.000 scalefont
-[1 0 0 -1 0 0 ] makefont setfont
-0.000 0.000 0.000 setrgbcolor
-0.000 0.000 rmoveto
-1.000 setlinewidth
-grestore
-% Start of sub-graphic
-p
-0.0535714 1.5124 0.35119 1.92562 MathSubStart
-%% Graphics
-%%IncludeResource: font Courier
-%%IncludeFont: Courier
-/Courier findfont 10 scalefont setfont
-% Scaling calculations
-0.0238095 0.952381 0.309017 0.294302 [
-[ 0 0 0 0 ]
-[ 1 .61803 0 0 ]
-] MathScale
-% Start of Graphics
-1 setlinecap
-1 setlinejoin
-newpath
-0 0 m
-1 0 L
-1 .61803 L
-0 .61803 L
-closepath
-clip
-newpath
-.5 1 0 r
-.5 Mabswid
-[ ] 0 setdash
-.02381 .30902 m
-.97619 .30902 L
-s
-MathSubEnd
-P
-% End of sub-graphic
-0 g
-gsave
-.38988 1.71901 -61 -8.90625 Mabsadd m
-1 1 Mabs scale
-currentpoint translate
-0 17.8125 translate 1 -1 scale
-/g { setgray} bind def
-/k { setcmykcolor} bind def
-/p { gsave} bind def
-/r { setrgbcolor} bind def
-/w { setlinewidth} bind def
-/C { curveto} bind def
-/F { fill} bind def
-/L { lineto} bind def
-/rL { rlineto} bind def
-/P { grestore} bind def
-/s { stroke} bind def
-/S { show} bind def
-/N {currentpoint 3 -1 roll show moveto} bind def
-/Msf { findfont exch scalefont [1 0 0 -1 0 0 ] makefont setfont} bind def
-/m { moveto} bind def
-/Mr { rmoveto} bind def
-/Mx {currentpoint exch pop moveto} bind def
-/My {currentpoint pop exch moveto} bind def
-/X {0 rmoveto} bind def
-/Y {0 exch rmoveto} bind def
-63.000 11.250 moveto
-%%IncludeResource: font Courier
-%%IncludeFont: Courier
-/Courier findfont 10.000 scalefont
-[1 0 0 -1 0 0 ] makefont setfont
-0.000 0.000 0.000 setrgbcolor
-0.000 0.000 rmoveto
-63.000 11.250 moveto
-%%IncludeResource: font Courier
-%%IncludeFont: Courier
-/Courier findfont 10.000 scalefont
-[1 0 0 -1 0 0 ] makefont setfont
-0.000 0.000 0.000 setrgbcolor
-(S1) show
-75.000 11.250 moveto
-%%IncludeResource: font Courier
-%%IncludeFont: Courier
-/Courier findfont 10.000 scalefont
-[1 0 0 -1 0 0 ] makefont setfont
-0.000 0.000 0.000 setrgbcolor
-0.000 0.000 rmoveto
-1.000 setlinewidth
-grestore
-MathSubEnd
-P
-% End of sub-graphic
-0 0 m
-1 0 L
-1 .48473 L
-0 .48473 L
-closepath
-clip
-newpath
-% End of Graphics
-MathPictureEnd
-
-%%PSTrailer
-grestore
-
-
-%%EPS Trailer
-
-pp_save restore
-
-end
-%%Trailer
-%%EOF
+%!PS-Adobe-2.0 EPSF-1.2
+%%BoundingBox: 61 4 73 19
+%%HiResBoundingBox: 61 4 72.1875 18.9375
+%%Creator: (Mathematica 5.2 for Microsoft Windows)
+%%CreationDate: (Tuesday, March 17, 2009) (15:17:30)
+%%Title: Clipboard
+%%DocumentNeededResources: font Courier
+%%DocumentSuppliedResources:
+%%DocumentNeededFonts: Courier
+%%DocumentSuppliedFonts:
+%%DocumentFonts: Courier
+%%EndComments
+0 22.9375 translate 1 -1 scale
+/g { setgray} bind def
+/k { setcmykcolor} bind def
+/p { gsave} bind def
+/r { setrgbcolor} bind def
+/w { setlinewidth} bind def
+/C { curveto} bind def
+/F { fill} bind def
+/L { lineto} bind def
+/rL { rlineto} bind def
+/P { grestore} bind def
+/s { stroke} bind def
+/S { show} bind def
+/N {currentpoint 3 -1 roll show moveto} bind def
+/Msf { findfont exch scalefont [1 0 0 -1 0 0 ] makefont setfont} bind def
+/m { moveto} bind def
+/Mr { rmoveto} bind def
+/Mx {currentpoint exch pop moveto} bind def
+/My {currentpoint pop exch moveto} bind def
+/X {0 rmoveto} bind def
+/Y {0 exch rmoveto} bind def
+63.000 14.750 moveto
+%%IncludeResource: font Courier
+%%IncludeFont: Courier
+/Courier findfont 12.000 scalefont
+[1 0 0 -1 0 0 ] makefont setfont
+0.000 0.000 0.000 setrgbcolor
+(p) show
+1.000 setlinewidth
+%%Trailer
+%%EOF
Modified: trunk/test-suite/cases/semantic/00023/00023-plot.jpg
===================================================================
(Binary files differ)
Modified: trunk/test-suite/cases/semantic/00023/00023-results.csv
===================================================================
--- trunk/test-suite/cases/semantic/00023/00023-results.csv 2009-03-17 23:17:50 UTC (rev 9407)
+++ trunk/test-suite/cases/semantic/00023/00023-results.csv 2009-03-17 23:19:37 UTC (rev 9408)
@@ -1,52 +1,52 @@
-time,case0023`S1,case0023`S2,case0023`S3,case0023`S4
-0,1.e-15,2.e-15,0,0
-0.1,9.759144954165249e-16,2.e-15,2.999999999999994e-17,2.999999999999994e-17
-0.2,9.535693254740217e-16,2.e-15,5.999999999999994e-17,5.999999999999994e-17
-0.3,9.328387392634451e-16,2.e-15,8.999999999999993e-17,8.999999999999993e-17
-0.4,9.136060726355842e-16,2.e-15,1.199999999999999e-16,1.199999999999999e-16
-0.5,8.957630925616796e-16,2.e-15,1.499999999999999e-16,1.499999999999999e-16
-0.6,8.792093838466277e-16,2.e-15,1.799999999999999e-16,1.799999999999999e-16
-0.7,8.638517880266135e-16,2.e-15,2.099999999999999e-16,2.099999999999999e-16
-0.8,8.496038782687408e-16,2.e-15,2.399999999999999e-16,2.399999999999999e-16
-0.9,8.363854726574305e-16,2.e-15,2.699999999999999e-16,2.699999999999999e-16
-1.,8.241221797600475e-16,2.e-15,2.999999999999999e-16,2.999999999999999e-16
-1.1,8.127449922726249e-16,2.e-15,3.299999999999999e-16,3.299999999999999e-16
-1.2,8.021898842508117e-16,2.e-15,3.599999999999999e-16,3.599999999999999e-16
-1.3,7.923974511833034e-16,2.e-15,3.899999999999999e-16,3.899999999999999e-16
-1.4,7.83312580885002e-16,2.e-15,4.199999999999999e-16,4.199999999999999e-16
-1.5,7.748841518929256e-16,2.e-15,4.499999999999999e-16,4.499999999999999e-16
-1.6,7.670647126950226e-16,2.e-15,4.799999999999999e-16,4.799999999999999e-16
-1.7,7.598103153080971e-16,2.e-15,5.099999999999999e-16,5.099999999999999e-16
-1.8,7.530800848100923e-16,2.e-15,5.399999999999998e-16,5.399999999999998e-16
-1.9,7.468361378013633e-16,2.e-15,5.699999999999998e-16,5.699999999999998e-16
-2.,7.410433684753337e-16,2.e-15,5.999999999999996e-16,5.999999999999996e-16
-2.1,7.356691787010059e-16,2.e-15,6.299999999999995e-16,6.299999999999995e-16
-2.2,7.306833013532753e-16,2.e-15,6.599999999999995e-16,6.599999999999995e-16
-2.3,7.260576716408179e-16,2.e-15,6.899999999999994e-16,6.899999999999994e-16
-2.4,7.217662825536327e-16,2.e-15,7.199999999999995e-16,7.199999999999995e-16
-2.5,7.177849848393127e-16,2.e-15,7.499999999999995e-16,7.499999999999995e-16
-2.6,7.140913560793413e-16,2.e-15,7.799999999999996e-16,7.799999999999996e-16
-2.7,7.10664605306965e-16,2.e-15,8.099999999999996e-16,8.099999999999996e-16
-2.8,7.07485466062865e-16,2.e-15,8.399999999999995e-16,8.399999999999995e-16
-2.9,7.045360481675192e-16,2.e-15,8.699999999999995e-16,8.699999999999995e-16
-3.,7.017997406990876e-16,2.e-15,8.999999999999994e-16,8.999999999999994e-16
-3.1,6.992611412855471e-16,2.e-15,9.299999999999995e-16,9.299999999999995e-16
-3.2,6.969059770012308e-16,2.e-15,9.599999999999996e-16,9.599999999999996e-16
-3.3,6.947209944867787e-16,2.e-15,9.899999999999995e-16,9.899999999999995e-16
-3.4,6.926938880596473e-16,2.e-15,1.019999999999999e-15,1.019999999999999e-15
-3.5,6.908132473591698e-16,2.e-15,1.049999999999999e-15,1.049999999999999e-15
-3.6,6.890684987427969e-16,2.e-15,1.079999999999999e-15,1.079999999999999e-15
-3.7,6.87449823883547e-16,2.e-15,1.109999999999999e-15,1.109999999999999e-15
-3.8,6.85948106509195e-16,2.e-15,1.139999999999999e-15,1.139999999999999e-15
-3.9,6.845548936117894e-16,2.e-15,1.169999999999999e-15,1.169999999999999e-15
-4.,6.832623520448989e-16,2.e-15,1.199999999999999e-15,1.199999999999999e-15
-4.1,6.820632082153084e-16,2.e-15,1.229999999999999e-15,1.229999999999999e-15
-4.2,6.809507086236499e-16,2.e-15,1.259999999999999e-15,1.259999999999999e-15
-4.3,6.799185911250919e-16,2.e-15,1.289999999999999e-15,1.289999999999999e-15
-4.4,6.78961052779654e-16,2.e-15,1.319999999999999e-15,1.319999999999999e-15
-4.5,6.780727051797072e-16,2.e-15,1.349999999999999e-15,1.349999999999999e-15
-4.6,6.772485452150084e-16,2.e-15,1.379999999999999e-15,1.379999999999999e-15
-4.7,6.764839337662874e-16,2.e-15,1.409999999999999e-15,1.409999999999999e-15
-4.8,6.757745722032853e-16,2.e-15,1.439999999999999e-15,1.439999999999999e-15
-4.9,6.751164676507967e-16,2.e-15,1.469999999999999e-15,1.469999999999999e-15
-5.,6.745059152855312e-16,2.e-15,1.499999999999999e-15,1.499999999999999e-15
\ No newline at end of file
+time,S1,S2,S3,S4
+0,0.1,0.2,0,0
+0.1,0.09759144911341092,0.2,0.001999986666781695,0.001999986666781695
+0.2,0.09535693254028187,0.2,0.003999893336748443,0.003999893336748443
+0.3,0.09328385587779553,0.2,0.005999640026451803,0.005999640026451803
+0.4,0.09136058821676538,0.2,0.007999146775697881,0.007999146775697881
+0.5,0.08957630869004361,0.2,0.009998333666377493,0.009998333666377493
+0.6,0.08792093455315332,0.2,0.01199712082956388,0.01199712082956388
+0.7,0.08638516342976922,0.2,0.01399542845896147,0.01399542845896147
+0.8,0.0849603826970136,0.2,0.01599317682635142,0.01599317682635142
+0.9,0.08363855169342913,0.2,0.01799028629444921,0.01799028629444921
+1,0.0824122090838859,0.2,0.0199866773253542,0.0199866773253542
+1.1,0.08127448909141642,0.2,0.02198227049510912,0.02198227049510912
+1.2,0.08021899099387111,0.2,0.02397698651084535,0.02397698651084535
+1.3,0.07923974681284694,0.2,0.0259707462175162,0.0259707462175162
+1.4,0.07833124812307188,0.2,0.02796347061095045,0.02796347061095045
+1.5,0.0774884098145454,0.2,0.02995508085222658,0.02995508085222658
+1.6,0.0767064793021856,0.2,0.03194549828330394,0.03194549828330394
+1.7,0.07598103202120829,0.2,0.03393464443196528,0.03393464443196528
+1.8,0.07530799948317511,0.2,0.03592244102718861,0.03592244102718861
+1.9,0.07468361225950014,0.2,0.03790881001359746,0.03790881001359746
+2,0.07410434521988453,0.2,0.03989367356485781,0.03989367356485781
+2.1,0.07356691845739809,0.2,0.04187695408867884,0.04187695408867884
+2.2,0.07306832218467854,0.2,0.04385857424264295,0.04385857424264295
+2.3,0.07260576536608632,0.2,0.04583845694828027,0.04583845694828027
+2.4,0.07217663596785608,0.2,0.04781652540432234,0.04781652540432234
+2.5,0.07177850125717374,0.2,0.04979270309046514,0.04979270309046514
+2.6,0.07140912900105584,0.2,0.05176691378366587,0.05176691378366587
+2.7,0.07106645673586055,0.2,0.05373908157000954,0.05373908157000954
+2.8,0.07074855201253288,0.2,0.05570913086099459,0.05570913086099459
+2.9,0.07045361114331128,0.2,0.05767698639529631,0.05767698639529631
+3,0.07017997062122942,0.2,0.0596425732540212,0.0596425732540212
+3.1,0.0699261082028538,0.2,0.0616058168696922,0.0616058168696922
+3.2,0.06969059833238385,0.2,0.0635666430461747,0.0635666430461747
+3.3,0.06947210676529221,0.2,0.06552497796298111,0.06552497796298111
+3.4,0.06926939161614944,0.2,0.0674807481808324,0.0674807481808324
+3.5,0.06908131991101843,0.2,0.06943388065843188,0.06943388065843188
+3.6,0.06890684512200219,0.2,0.0713843027614743,0.0713843027614743
+3.7,0.06874498437425805,0.2,0.07333194228028277,0.07333194228028277
+3.8,0.06859481807508797,0.2,0.07527672743042656,0.07527672743042656
+3.9,0.06845549238266896,0.2,0.07721858686147709,0.07721858686147709
+4,0.06832623222662504,0.2,0.07915744967195848,0.07915744967195848
+4.1,0.06820631801046115,0.2,0.08109324541896618,0.08109324541896618
+4.2,0.06809507360605278,0.2,0.08302590413324192,0.08302590413324192
+4.3,0.06799186632039554,0.2,0.08495535631930629,0.08495535631930629
+4.4,0.06789610913820446,0.2,0.08688153296401921,0.08688153296401921
+4.5,0.06780726989338795,0.2,0.0888043655512665,0.0888043655512665
+4.6,0.06772485402191752,0.2,0.09072378606997902,0.09072378606997902
+4.7,0.0676483968275262,0.2,0.09263972702822254,0.09263972702822254
+4.8,0.06757746346648155,0.2,0.09455212145332476,0.09455212145332476
+4.9,0.0675116524798345,0.2,0.09646090289812656,0.09646090289812656
+5,0.06745059678156079,0.2,0.09836600546044098,0.09836600546044098
Modified: trunk/test-suite/cases/semantic/00023/00023-sbml-l2v1.xml
===================================================================
--- trunk/test-suite/cases/semantic/00023/00023-sbml-l2v1.xml 2009-03-17 23:17:50 UTC (rev 9407)
+++ trunk/test-suite/cases/semantic/00023/00023-sbml-l2v1.xml 2009-03-17 23:19:37 UTC (rev 9408)
@@ -5,15 +5,15 @@
<compartment id="compartment" name="compartment" size="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1e-015" substanceUnits="substance"/>
- <species id="S2" name="S2" compartment="compartment" initialAmount="2e-015" substanceUnits="substance" boundaryCondition="true" constant="true"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.1" substanceUnits="substance"/>
+ <species id="S2" name="S2" compartment="compartment" initialAmount="0.2" substanceUnits="substance" boundaryCondition="true" constant="true"/>
<species id="S3" name="S3" compartment="compartment" initialAmount="0" substanceUnits="substance"/>
<species id="S4" name="S4" compartment="compartment" initialAmount="0" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
<parameter id="k1" name="k1" value="0.75"/>
<parameter id="k2" name="k2" value="0.25"/>
- <parameter id="k3" name="k3" value="0.15"/>
+ <parameter id="k3" name="k3" value="0.1"/>
<parameter id="k4" name="k4" value="0.1"/>
</listOfParameters>
<listOfReactions>
Modified: trunk/test-suite/cases/semantic/00023/00023-sbml-l2v2.xml
===================================================================
--- trunk/test-suite/cases/semantic/00023/00023-sbml-l2v2.xml 2009-03-17 23:17:50 UTC (rev 9407)
+++ trunk/test-suite/cases/semantic/00023/00023-sbml-l2v2.xml 2009-03-17 23:19:37 UTC (rev 9408)
@@ -5,15 +5,15 @@
<compartment id="compartment" name="compartment" size="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1e-015" substanceUnits="substance"/>
- <species id="S2" name="S2" compartment="compartment" initialAmount="2e-015" substanceUnits="substance" boundaryCondition="true" constant="true"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.1" substanceUnits="substance"/>
+ <species id="S2" name="S2" compartment="compartment" initialAmount="0.2" substanceUnits="substance" boundaryCondition="true" constant="true"/>
<species id="S3" name="S3" compartment="compartment" initialAmount="0" substanceUnits="substance"/>
<species id="S4" name="S4" compartment="compartment" initialAmount="0" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
<parameter id="k1" name="k1" value="0.75"/>
<parameter id="k2" name="k2" value="0.25"/>
- <parameter id="k3" name="k3" value="0.15"/>
+ <parameter id="k3" name="k3" value="0.1"/>
<parameter id="k4" name="k4" value="0.1"/>
</listOfParameters>
<listOfReactions>
Modified: trunk/test-suite/cases/semantic/00023/00023-sbml-l2v3.xml
===================================================================
--- trunk/test-suite/cases/semantic/00023/00023-sbml-l2v3.xml 2009-03-17 23:17:50 UTC (rev 9407)
+++ trunk/test-suite/cases/semantic/00023/00023-sbml-l2v3.xml 2009-03-17 23:19:37 UTC (rev 9408)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated 6-February-2008 12:43:40.0156250 -->
-<!-- Generated by MathSBML 2.7.1 (7 December 2007) -->
+<!-- Generated 17-March-2009 15:17:21.3281250 -->
+<!-- Generated by MathSBML 2.7.5 [2-May-2008] -->
<!-- Generated using Mathematica Version 5.2 for Microsoft Windows (June 20, 2005) -->
<sbml xmlns="http://www.sbml.org/sbml/level2/version3"
level="2"
@@ -17,7 +17,7 @@
name="compartment"
spatialDimensions="3"
units="volume"
- size="1"/>
+ size="1."/>
</listOfCompartments>
<listOfSpecies>
<species id="S1"
@@ -25,7 +25,7 @@
compartment="compartment"
boundaryCondition="false"
constant="false"
- initialAmount="1.e-15"
+ initialAmount="0.1"
substanceUnits="substance"
hasOnlySubstanceUnits="false"/>
<species id="S2"
@@ -33,7 +33,7 @@
compartment="compartment"
boundaryCondition="true"
constant="true"
- initialAmount="2.e-15"
+ initialAmount="0.2"
substanceUnits="substance"
hasOnlySubstanceUnits="false"/>
<species id="S3"
@@ -62,7 +62,7 @@
value="0.25"/>
<parameter id="k3"
name="k3"
- value="0.15"/>
+ value="0.1"/>
<parameter id="k4"
name="k4"
value="0.1"/>
Modified: trunk/test-suite/cases/semantic/00023/00023-sbml-l2v4.xml
===================================================================
--- trunk/test-suite/cases/semantic/00023/00023-sbml-l2v4.xml 2009-03-17 23:17:50 UTC (rev 9407)
+++ trunk/test-suite/cases/semantic/00023/00023-sbml-l2v4.xml 2009-03-17 23:19:37 UTC (rev 9408)
@@ -5,15 +5,15 @@
<compartment id="compartment" name="compartment" size="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1e-015" substanceUnits="substance"/>
- <species id="S2" name="S2" compartment="compartment" initialAmount="2e-015" substanceUnits="substance" boundaryCondition="true" constant="true"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.1" substanceUnits="substance"/>
+ <species id="S2" name="S2" compartment="compartment" initialAmount="0.2" substanceUnits="substance" boundaryCondition="true" constant="true"/>
<species id="S3" name="S3" compartment="compartment" initialAmount="0" substanceUnits="substance"/>
<species id="S4" name="S4" compartment="compartment" initialAmount="0" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
<parameter id="k1" name="k1" value="0.75"/>
<parameter id="k2" name="k2" value="0.25"/>
- <parameter id="k3" name="k3" value="0.15"/>
+ <parameter id="k3" name="k3" value="0.1"/>
<parameter id="k4" name="k4" value="0.1"/>
</listOfParameters>
<listOfReactions>
Modified: trunk/test-suite/cases/semantic/00023/00023-settings.txt
===================================================================
--- trunk/test-suite/cases/semantic/00023/00023-settings.txt 2009-03-17 23:17:50 UTC (rev 9407)
+++ trunk/test-suite/cases/semantic/00023/00023-settings.txt 2009-03-17 23:19:37 UTC (rev 9408)
@@ -2,7 +2,7 @@
duration: 5.0
steps: 50
variables: S1, S2, S3, S4
-absolute: 0.0000000000000000001
+absolute: 1.000000e-004
relative: 0.0001
amount: S1, S2, S3, S4
concentration:
Modified: trunk/test-suite/cases/semantic/00024/00024-model.m
===================================================================
--- trunk/test-suite/cases/semantic/00024/00024-model.m 2009-03-17 23:17:50 UTC (rev 9407)
+++ trunk/test-suite/cases/semantic/00024/00024-model.m 2009-03-17 23:19:37 UTC (rev 9408)
@@ -23,13 +23,13 @@
The initial conditions are as follows:
[{width:30em,margin-left:5em}| |*Value* |*Units* |
-|Initial amount of S1 |$1.0 \x 10^-15$ |mole |
-|Initial amount of S2 |$2.0 \x 10^-15$ |mole |
+|Initial amount of S1 |$1.0 \x 10^-4$ |mole |
+|Initial amount of S2 |$2.0 \x 10^-4$ |mole |
|Initial amount of S3 |$0$ |mole |
|Initial amount of S4 |$0$ |mole |
|Value of parameter k1 |$0.75$ |second^-1^ |
|Value of parameter k2 |$0.25$ |second^-1^ |
-|Value of parameter k3 |$0.15$ |second^-1^ |
+|Value of parameter k3 |$0.4$ |second^-1^ |
|Value of parameter k4 |$0.1$ |litre mole^-1^ second^-1^ |
|Volume of compartment "compartment" |$1$ |litre |]
@@ -46,14 +46,14 @@
newcase[ "00024" ];
addCompartment[ compartment, size -> 1 ];
-addSpecies[ S1, initialAmount -> 1.0 10^-15];
-addSpecies[ S2, initialAmount -> 2.0 10^-15];
+addSpecies[ S1, initialAmount -> 1.0 10^-4];
+addSpecies[ S2, initialAmount -> 2.0 10^-4];
addSpecies[ S3, initialAmount -> 0,constant-> True,
boundaryCondition->True];
addSpecies[ S4, initialAmount -> 0];
addParameter[ k1, value -> 0.75 ];
addParameter[ k2, value -> 0.25 ];
-addParameter[ k3, value -> 0.15 ];
+addParameter[ k3, value -> 0.4 ];
addParameter[ k4, value -> 0.1 ];
addReaction[ S1 -> S2, reversible -> False,
kineticLaw -> k1 * S1 * compartment ];
Modified: trunk/test-suite/cases/semantic/00024/00024-results.csv
===================================================================
--- trunk/test-suite/cases/semantic/00024/00024-results.csv 2009-03-17 23:17:50 UTC (rev 9407)
+++ trunk/test-suite/cases/semantic/00024/00024-results.csv 2009-03-17 23:19:37 UTC (rev 9408)
@@ -1,52 +1,52 @@
-time,case0024`S1,case0024`S2,case0024`S3,case0024`S4
-0,1e-015,2e-015,0,0
-0.5,8.93691e-016,1.9577e-015,0,1.48609e-016
-1,8.14799e-016,1.89212e-015,0,2.9308e-016
-1.5,7.53019e-016,1.81484e-015,0,4.32139e-016
-2,7.02185e-016,1.73263e-015,0,5.65185e-016
-2.5,6.58597e-016,1.64939e-015,0,6.92009e-016
-3,6.20015e-016,1.56736e-015,0,8.12625e-016
-3.5,5.85074e-016,1.48775e-015,0,9.27174e-016
-4,5.52928e-016,1.41121e-015,0,1.03586e-015
-4.5,5.23039e-016,1.33802e-015,0,1.13894e-015
-5,4.95059e-016,1.26829e-015,0,1.23665e-015
-5.5,4.68751e-016,1.20198e-015,0,1.32927e-015
-6,4.43944e-016,1.13902e-015,0,1.41704e-015
-6.5,4.20511e-016,1.07929e-015,0,1.5002e-015
-7,3.98352e-016,1.02264e-015,0,1.57901e-015
-7.5,3.77382e-016,9.68946e-016,0,1.65367e-015
-8,3.57529e-016,9.18054e-016,0,1.72442e-015
-8.5,3.38728e-016,8.69825e-016,0,1.79145e-015
-9,3.2092e-016,8.24125e-016,0,1.85495e-015
-9.5,3.04052e-016,7.80823e-016,0,1.91513e-015
-10,2.88071e-016,7.39794e-016,0,1.97213e-015
-10.5,2.72932e-016,7.0092e-016,0,2.02615e-015
-11,2.58588e-016,6.64088e-016,0,2.07732e-015
-11.5,2.44999e-016,6.29191e-016,0,2.12581e-015
-12,2.32124e-016,5.96128e-016,0,2.17175e-015
-12.5,2.19926e-016,5.64802e-016,0,2.21527e-015
-13,2.08369e-016,5.35122e-016,0,2.25651e-015
-13.5,1.97419e-016,5.07001e-016,0,2.29558e-015
-14,1.87044e-016,4.80359e-016,0,2.3326e-015
-14.5,1.77215e-016,4.55116e-016,0,2.36767e-015
-15,1.67903e-016,4.312e-016,0,2.4009e-015
-15.5,1.59079e-016,4.08541e-016,0,2.43238e-015
-16,1.5072e-016,3.87072e-016,0,2.46221e-015
-16.5,1.428e-016,3.66731e-016,0,2.49047e-015
-17,1.35296e-016,3.4746e-016,0,2.51724e-015
-17.5,1.28186e-016,3.29201e-016,0,2.54261e-015
-18,1.2145e-016,3.11902e-016,0,2.56665e-015
-18.5,1.15068e-016,2.95511e-016,0,2.58942e-015
-19,1.09021e-016,2.79982e-016,0,2.611e-015
-19.5,1.03292e-016,2.65269e-016,0,2.63144e-015
-20,9.78638e-017,2.51329e-016,0,2.65081e-015
-20.5,9.27211e-017,2.38122e-016,0,2.66916e-015
-21,8.78487e-017,2.25609e-016,0,2.68654e-015
-21.5,8.32323e-017,2.13753e-016,0,2.70301e-015
-22,7.88584e-017,2.02521e-016,0,2.71862e-015
-22.5,7.47145e-017,1.91878e-016,0,2.73341e-015
-23,7.07882e-017,1.81795e-016,0,2.74742e-015
-23.5,6.70683e-017,1.72242e-016,0,2.76069e-015
-2...
[truncated message content] |
|
From: <sar...@us...> - 2009-03-17 23:17:54
|
Revision: 9407
http://sbml.svn.sourceforge.net/sbml/?rev=9407&view=rev
Author: sarahkeating
Date: 2009-03-17 23:17:50 +0000 (Tue, 17 Mar 2009)
Log Message:
-----------
changes values used so that tolerance does not exceed machine double precision
Modified Paths:
--------------
trunk/test-suite/cases/semantic/00011/00011-model.m
trunk/test-suite/cases/semantic/00011/00011-results.csv
trunk/test-suite/cases/semantic/00011/00011-sbml-l1v2.xml
trunk/test-suite/cases/semantic/00011/00011-sbml-l2v1.xml
trunk/test-suite/cases/semantic/00011/00011-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00011/00011-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00011/00011-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00011/00011-settings.txt
trunk/test-suite/cases/semantic/00012/00012-model.m
trunk/test-suite/cases/semantic/00012/00012-results.csv
trunk/test-suite/cases/semantic/00012/00012-sbml-l1v2.xml
trunk/test-suite/cases/semantic/00012/00012-sbml-l2v1.xml
trunk/test-suite/cases/semantic/00012/00012-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00012/00012-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00012/00012-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00012/00012-settings.txt
trunk/test-suite/cases/semantic/00013/00013-model.m
trunk/test-suite/cases/semantic/00013/00013-results.csv
trunk/test-suite/cases/semantic/00013/00013-sbml-l1v2.xml
trunk/test-suite/cases/semantic/00013/00013-sbml-l2v1.xml
trunk/test-suite/cases/semantic/00013/00013-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00013/00013-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00013/00013-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00013/00013-settings.txt
trunk/test-suite/cases/semantic/00014/00014-model.m
trunk/test-suite/cases/semantic/00014/00014-plot.eps
trunk/test-suite/cases/semantic/00014/00014-plot.jpg
trunk/test-suite/cases/semantic/00014/00014-results.csv
trunk/test-suite/cases/semantic/00014/00014-sbml-l1v2.xml
trunk/test-suite/cases/semantic/00014/00014-sbml-l2v1.xml
trunk/test-suite/cases/semantic/00014/00014-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00014/00014-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00014/00014-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00014/00014-settings.txt
trunk/test-suite/cases/semantic/00015/00015-model.m
trunk/test-suite/cases/semantic/00015/00015-plot.eps
trunk/test-suite/cases/semantic/00015/00015-plot.jpg
trunk/test-suite/cases/semantic/00015/00015-results.csv
trunk/test-suite/cases/semantic/00015/00015-sbml-l1v2.xml
trunk/test-suite/cases/semantic/00015/00015-sbml-l2v1.xml
trunk/test-suite/cases/semantic/00015/00015-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00015/00015-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00015/00015-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00015/00015-settings.txt
trunk/test-suite/cases/semantic/00016/00016-model.m
trunk/test-suite/cases/semantic/00016/00016-plot.eps
trunk/test-suite/cases/semantic/00016/00016-plot.jpg
trunk/test-suite/cases/semantic/00016/00016-results.csv
trunk/test-suite/cases/semantic/00016/00016-sbml-l1v2.xml
trunk/test-suite/cases/semantic/00016/00016-sbml-l2v1.xml
trunk/test-suite/cases/semantic/00016/00016-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00016/00016-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00016/00016-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00016/00016-settings.txt
trunk/test-suite/cases/semantic/00017/00017-model.m
trunk/test-suite/cases/semantic/00017/00017-plot.eps
trunk/test-suite/cases/semantic/00017/00017-plot.jpg
trunk/test-suite/cases/semantic/00017/00017-results.csv
trunk/test-suite/cases/semantic/00017/00017-sbml-l1v2.xml
trunk/test-suite/cases/semantic/00017/00017-sbml-l2v1.xml
trunk/test-suite/cases/semantic/00017/00017-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00017/00017-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00017/00017-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00017/00017-settings.txt
trunk/test-suite/cases/semantic/00018/00018-model.m
trunk/test-suite/cases/semantic/00018/00018-plot.eps
trunk/test-suite/cases/semantic/00018/00018-plot.jpg
trunk/test-suite/cases/semantic/00018/00018-results.csv
trunk/test-suite/cases/semantic/00018/00018-sbml-l1v2.xml
trunk/test-suite/cases/semantic/00018/00018-sbml-l2v1.xml
trunk/test-suite/cases/semantic/00018/00018-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00018/00018-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00018/00018-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00018/00018-settings.txt
trunk/test-suite/cases/semantic/00019/00019-model.m
trunk/test-suite/cases/semantic/00019/00019-plot.eps
trunk/test-suite/cases/semantic/00019/00019-plot.jpg
trunk/test-suite/cases/semantic/00019/00019-results.csv
trunk/test-suite/cases/semantic/00019/00019-sbml-l1v2.xml
trunk/test-suite/cases/semantic/00019/00019-sbml-l2v1.xml
trunk/test-suite/cases/semantic/00019/00019-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00019/00019-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00019/00019-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00019/00019-settings.txt
trunk/test-suite/cases/semantic/00020/00020-model.m
trunk/test-suite/cases/semantic/00020/00020-plot.eps
trunk/test-suite/cases/semantic/00020/00020-plot.jpg
trunk/test-suite/cases/semantic/00020/00020-results.csv
trunk/test-suite/cases/semantic/00020/00020-sbml-l1v2.xml
trunk/test-suite/cases/semantic/00020/00020-sbml-l2v1.xml
trunk/test-suite/cases/semantic/00020/00020-sbml-l2v2.xml
trunk/test-suite/cases/semantic/00020/00020-sbml-l2v3.xml
trunk/test-suite/cases/semantic/00020/00020-sbml-l2v4.xml
trunk/test-suite/cases/semantic/00020/00020-settings.txt
Modified: trunk/test-suite/cases/semantic/00011/00011-model.m
===================================================================
--- trunk/test-suite/cases/semantic/00011/00011-model.m 2009-03-17 23:16:10 UTC (rev 9406)
+++ trunk/test-suite/cases/semantic/00011/00011-model.m 2009-03-17 23:17:50 UTC (rev 9407)
@@ -21,9 +21,9 @@
The initial conditions are as follows:
[{width:30em,margin-left:5em}| |*Value* |*Units* |
-|Initial amount of S1 |$1.0 \x 10^-15$ |mole |
-|Initial amount of S2 |$2.0 \x 10^-15$ |mole |
-|Initial amount of S3 |$1.0 \x 10^-15$ |mole |
+|Initial amount of S1 |$1.0 \x 10^-3$ |mole |
+|Initial amount of S2 |$2.0 \x 10^-3$ |mole |
+|Initial amount of S3 |$1.0 \x 10^-3$ |mole |
|Value of parameter k1 |$0.75$ |litre mole^-1^ second^-1^ |
|Value of parameter k2 |$0.25$ |second^-1^ |
|Volume of compartment "compartment" |$1$ |litre |]
@@ -41,9 +41,9 @@
newcase[ "00011" ];
addCompartment[ compartment, size -> 1 ];
-addSpecies[ S1, initialAmount -> 1.0 10^-15, boundaryCondition -> True];
-addSpecies[ S2, initialAmount -> 2.0 10^-15];
-addSpecies[ S3, initialAmount -> 1.0 10^-15];
+addSpecies[ S1, initialAmount -> 1.0 10^-3, boundaryCondition -> True];
+addSpecies[ S2, initialAmount -> 2.0 10^-3];
+addSpecies[ S3, initialAmount -> 1.0 10^-3];
addParameter[ k1, value -> 0.75 ];
addParameter[ k2, value -> 0.25 ];
addReaction[ S1 + S2 -> S3, reversible -> False,
Modified: trunk/test-suite/cases/semantic/00011/00011-results.csv
===================================================================
--- trunk/test-suite/cases/semantic/00011/00011-results.csv 2009-03-17 23:16:10 UTC (rev 9406)
+++ trunk/test-suite/cases/semantic/00011/00011-results.csv 2009-03-17 23:17:50 UTC (rev 9407)
@@ -1,52 +1,52 @@
-time,case00011`S1,case00011`S2,case00011`S3
-0,1e-015,2e-015,1e-015
-0.4,1e-015,2.09516e-015,9.04837e-016
-0.8,1e-015,2.18127e-015,8.18731e-016
-1.2,1e-015,2.25918e-015,7.40818e-016
-1.6,1e-015,2.32968e-015,6.7032e-016
-2,1e-015,2.39347e-015,6.06531e-016
-2.4,1e-015,2.45119e-015,5.48812e-016
-2.8,1e-015,2.50341e-015,4.96585e-016
-3.2,1e-015,2.55067e-015,4.49329e-016
-3.6,1e-015,2.59343e-015,4.0657e-016
-4,1e-015,2.63212e-015,3.67879e-016
-4.4,1e-015,2.66713e-015,3.32871e-016
-4.8,1e-015,2.69881e-015,3.01194e-016
-5.2,1e-015,2.72747e-015,2.72532e-016
-5.6,1e-015,2.7534e-015,2.46597e-016
-6,1e-015,2.77687e-015,2.2313e-016
-6.4,1e-015,2.7981e-015,2.01897e-016
-6.8,1e-015,2.81732e-015,1.82684e-016
-7.2,1e-015,2.8347e-015,1.65299e-016
-7.6,1e-015,2.85043e-015,1.49569e-016
-8,1e-015,2.86466e-015,1.35335e-016
-8.4,1e-015,2.87754e-015,1.22456e-016
-8.8,1e-015,2.8892e-015,1.10803e-016
-9.2,1e-015,2.89974e-015,1.00259e-016
-9.6,1e-015,2.90928e-015,9.0718e-017
-10,1e-015,2.91792e-015,8.2085e-017
-10.4,1e-015,2.92573e-015,7.42736e-017
-10.8,1e-015,2.93279e-015,6.72055e-017
-11.2,1e-015,2.93919e-015,6.08101e-017
-11.6,1e-015,2.94498e-015,5.50232e-017
-12,1e-015,2.95021e-015,4.97871e-017
-12.4,1e-015,2.95495e-015,4.50492e-017
-12.8,1e-015,2.95924e-015,4.07622e-017
-13.2,1e-015,2.96312e-015,3.68832e-017
-13.6,1e-015,2.96663e-015,3.33733e-017
-14,1e-015,2.9698e-015,3.01974e-017
-14.4,1e-015,2.97268e-015,2.73237e-017
-14.8,1e-015,2.97528e-015,2.47235e-017
-15.2,1e-015,2.97763e-015,2.23708e-017
-15.6,1e-015,2.97976e-015,2.02419e-017
-16,1e-015,2.98168e-015,1.83156e-017
-16.4,1e-015,2.98343e-015,1.65727e-017
-16.8,1e-015,2.985e-015,1.49956e-017
-17.2,1e-015,2.98643e-015,1.35686e-017
-17.6,1e-015,2.98772e-015,1.22773e-017
-18,1e-015,2.98889e-015,1.1109e-017
-18.4,1e-015,2.98995e-015,1.00518e-017
-18.8,1e-015,2.9909e-015,9.09528e-018
-19.2,1e-015,2.99177e-015,8.22975e-018
-19.6,1e-015,2.99255e-015,7.44658e-018
-20,1e-015,2.99326e-015,6.73795e-018
\ No newline at end of file
+time,S1,S2,S3
+0,0.001,0.002,0.001
+0.4,0.001,0.002094577655554321,0.000905422344445679
+0.8,0.001,0.002180129387840088,0.0008198706121599117
+1.2,0.001,0.002257516576750601,0.0007424834232493992
+1.6,0.001,0.002327518397256901,0.0006724816027430991
+2,0.001,0.002390839664551708,0.0006091603354482921
+2.4,0.001,0.002448117930499942,0.0005518820695000582
+2.8,0.001,0.002499929902846643,0.0005000700971533573
+3.2,0.001,0.00254679725181425,0.0004532027481857498
+3.6,0.001,0.002589191862553121,0.0004108081374468795
+4,0.001,0.002627540586329722,0.0003724594136702786
+4.4,0.001,0.002662229538289968,0.0003377704617100319
+4.8,0.001,0.002693607985069846,0.000306392014930154
+5.2,0.001,0.002721991861395829,0.0002780081386041706
+5.6,0.001,0.002747666951082084,0.0002523330489179162
+6,0.001,0.002770891764452404,0.0002291082355475963
+6.4,0.001,0.002791900141158288,0.0002080998588417123
+6.8,0.001,0.002810903604599693,0.0001890963954003072
+7.2,0.001,0.002828093491654016,0.000171906508345984
+7.6,0.001,0.002843642879156537,0.0001563571208434636
+8,0.001,0.002857708326529137,0.0001422916734708627
+8.4,0.001,0.002870431452103012,0.0001295685478969879
+8.8,0.001,0.002881940359006601,0.0001180596409933993
+9.2,0.001,0.002892350924975347,0.000107649075024653
+9.6,0.001,0.002901767969069763,9.823203093023724e-005
+10,0.001,0.002910286307048927,8.971369295107265e-005
+10.4,0.001,0.002917991706025482,8.200829397451825e-005
+10.8,0.001,0.002924961748014085,7.503825198591568e-005
+11.2,0.001,0.00293126661106799,6.873338893200969e-005
+11.6,0.001,0.002936969775868649,6.303022413135136e-005
+12,0.001,0.002942128664882633,5.787133511736755e-005
+12.4,0.001,0.002946795220521272,5.320477947872794e-005
+12.8,0.001,0.002951016428124206,4.898357187579435e-005
+13.2,0.001,0.002954834789032522,4.516521096747807e-005
+13.6,0.001,0.002958288748514644,4.171125148535609e-005
+14,0.001,0.002961413082853537,3.858691714646279e-005
+14.4,0.001,0.002964239249492641,3.576075050735944e-005
+14.8,0.001,0.002966795703765972,3.320429623402774e-005
+15.2,0.001,0.002969108185401418,3.089181459858201e-005
+15.6,0.001,0.002971199977681866,2.880002231813392e-005
+16,0.001,0.002973092141873561,2.690785812643913e-005
+16.4,0.001,0.002974803729282023,2.519627071797759e-005
+16.8,0.001,0.002976351973070623,2.364802692937692e-005
+17.2,0.001,0.002977752461773152,2.224753822684833e-005
+17.6,0.001,0.002979019296247381,2.098070375261934e-005
+18,0.001,0.002980165231649928,1.983476835007206e-005
+18.4,0.001,0.002981201805861891,1.879819413810926e-005
+18.8,0.001,0.002982139455658308,1.786054434169159e-005
+19.2,0.001,0.00298298762179111,1.70123782088902e-005
+19.6,0.001,0.002983754844043575,1.624515595642484e-005
+20,0.001,0.002984448847213371,1.555115278662856e-005
Modified: trunk/test-suite/cases/semantic/00011/00011-sbml-l1v2.xml
===================================================================
--- trunk/test-suite/cases/semantic/00011/00011-sbml-l1v2.xml 2009-03-17 23:16:10 UTC (rev 9406)
+++ trunk/test-suite/cases/semantic/00011/00011-sbml-l1v2.xml 2009-03-17 23:17:50 UTC (rev 9407)
@@ -5,9 +5,9 @@
<compartment name="compartment" volume="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species name="S1" compartment="compartment" initialAmount="1e-015" units="substance" boundaryCondition="true"/>
- <species name="S2" compartment="compartment" initialAmount="2e-015" units="substance"/>
- <species name="S3" compartment="compartment" initialAmount="1e-015" units="substance"/>
+ <species name="S1" compartment="compartment" initialAmount="0.001" units="substance" boundaryCondition="true"/>
+ <species name="S2" compartment="compartment" initialAmount="0.002" units="substance"/>
+ <species name="S3" compartment="compartment" initialAmount="0.001" units="substance"/>
</listOfSpecies>
<listOfParameters>
<parameter name="k1" value="0.75"/>
Modified: trunk/test-suite/cases/semantic/00011/00011-sbml-l2v1.xml
===================================================================
--- trunk/test-suite/cases/semantic/00011/00011-sbml-l2v1.xml 2009-03-17 23:16:10 UTC (rev 9406)
+++ trunk/test-suite/cases/semantic/00011/00011-sbml-l2v1.xml 2009-03-17 23:17:50 UTC (rev 9407)
@@ -5,9 +5,9 @@
<compartment id="compartment" name="compartment" size="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1e-015" substanceUnits="substance" boundaryCondition="true"/>
- <species id="S2" name="S2" compartment="compartment" initialAmount="2e-015" substanceUnits="substance"/>
- <species id="S3" name="S3" compartment="compartment" initialAmount="1e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.001" substanceUnits="substance" boundaryCondition="true"/>
+ <species id="S2" name="S2" compartment="compartment" initialAmount="0.002" substanceUnits="substance"/>
+ <species id="S3" name="S3" compartment="compartment" initialAmount="0.001" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
<parameter id="k1" name="k1" value="0.75"/>
Modified: trunk/test-suite/cases/semantic/00011/00011-sbml-l2v2.xml
===================================================================
--- trunk/test-suite/cases/semantic/00011/00011-sbml-l2v2.xml 2009-03-17 23:16:10 UTC (rev 9406)
+++ trunk/test-suite/cases/semantic/00011/00011-sbml-l2v2.xml 2009-03-17 23:17:50 UTC (rev 9407)
@@ -5,9 +5,9 @@
<compartment id="compartment" name="compartment" size="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1e-015" substanceUnits="substance" boundaryCondition="true"/>
- <species id="S2" name="S2" compartment="compartment" initialAmount="2e-015" substanceUnits="substance"/>
- <species id="S3" name="S3" compartment="compartment" initialAmount="1e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.001" substanceUnits="substance" boundaryCondition="true"/>
+ <species id="S2" name="S2" compartment="compartment" initialAmount="0.002" substanceUnits="substance"/>
+ <species id="S3" name="S3" compartment="compartment" initialAmount="0.001" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
<parameter id="k1" name="k1" value="0.75"/>
Modified: trunk/test-suite/cases/semantic/00011/00011-sbml-l2v3.xml
===================================================================
--- trunk/test-suite/cases/semantic/00011/00011-sbml-l2v3.xml 2009-03-17 23:16:10 UTC (rev 9406)
+++ trunk/test-suite/cases/semantic/00011/00011-sbml-l2v3.xml 2009-03-17 23:17:50 UTC (rev 9407)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated 5-February-2008 17:26:23.6562500 -->
-<!-- Generated by MathSBML 2.7.1 (7 December 2007) -->
+<!-- Generated 17-March-2009 14:25:01.7968750 -->
+<!-- Generated by MathSBML 2.7.5 [2-May-2008] -->
<!-- Generated using Mathematica Version 5.2 for Microsoft Windows (June 20, 2005) -->
<sbml xmlns="http://www.sbml.org/sbml/level2/version3"
level="2"
@@ -17,7 +17,7 @@
name="compartment"
spatialDimensions="3"
units="volume"
- size="1"/>
+ size="1."/>
</listOfCompartments>
<listOfSpecies>
<species id="S1"
@@ -25,7 +25,7 @@
compartment="compartment"
boundaryCondition="true"
constant="false"
- initialAmount="1.e-15"
+ initialAmount="0.001"
substanceUnits="substance"
hasOnlySubstanceUnits="false"/>
<species id="S2"
@@ -33,7 +33,7 @@
compartment="compartment"
boundaryCondition="false"
constant="false"
- initialAmount="2.e-15"
+ initialAmount="0.002"
substanceUnits="substance"
hasOnlySubstanceUnits="false"/>
<species id="S3"
@@ -41,7 +41,7 @@
compartment="compartment"
boundaryCondition="false"
constant="false"
- initialAmount="1.e-15"
+ initialAmount="0.001"
substanceUnits="substance"
hasOnlySubstanceUnits="false"/>
</listOfSpecies>
Modified: trunk/test-suite/cases/semantic/00011/00011-sbml-l2v4.xml
===================================================================
--- trunk/test-suite/cases/semantic/00011/00011-sbml-l2v4.xml 2009-03-17 23:16:10 UTC (rev 9406)
+++ trunk/test-suite/cases/semantic/00011/00011-sbml-l2v4.xml 2009-03-17 23:17:50 UTC (rev 9407)
@@ -5,9 +5,9 @@
<compartment id="compartment" name="compartment" size="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1e-015" substanceUnits="substance" boundaryCondition="true"/>
- <species id="S2" name="S2" compartment="compartment" initialAmount="2e-015" substanceUnits="substance"/>
- <species id="S3" name="S3" compartment="compartment" initialAmount="1e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.001" substanceUnits="substance" boundaryCondition="true"/>
+ <species id="S2" name="S2" compartment="compartment" initialAmount="0.002" substanceUnits="substance"/>
+ <species id="S3" name="S3" compartment="compartment" initialAmount="0.001" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
<parameter id="k1" name="k1" value="0.75"/>
Modified: trunk/test-suite/cases/semantic/00011/00011-settings.txt
===================================================================
--- trunk/test-suite/cases/semantic/00011/00011-settings.txt 2009-03-17 23:16:10 UTC (rev 9406)
+++ trunk/test-suite/cases/semantic/00011/00011-settings.txt 2009-03-17 23:17:50 UTC (rev 9407)
@@ -2,7 +2,7 @@
duration: 20.0
steps: 50
variables: S1, S2, S3
-absolute: 0.0000000000000000001
+absolute: 1.000000e-006
relative: 0.0001
amount: S1, S2, S3
concentration:
Modified: trunk/test-suite/cases/semantic/00012/00012-model.m
===================================================================
--- trunk/test-suite/cases/semantic/00012/00012-model.m 2009-03-17 23:16:10 UTC (rev 9406)
+++ trunk/test-suite/cases/semantic/00012/00012-model.m 2009-03-17 23:17:50 UTC (rev 9407)
@@ -21,9 +21,9 @@
The initial conditions are as follows:
[{width:30em,margin-left:5em}| |*Value* |*Units* |
-|Initial amount of S1 |$1.0 \x 10^-15$ |mole |
-|Initial amount of S2 |$2.0 \x 10^-15$ |mole |
-|Initial amount of S3 |$1.0 \x 10^-15$ |mole |
+|Initial amount of S1 |$1.0 \x 10^-2$ |mole |
+|Initial amount of S2 |$2.0 \x 10^-2$ |mole |
+|Initial amount of S3 |$1.0 \x 10^-2$ |mole |
|Value of parameter k1 |$0.75$ |litre mole^-1^ second^-1^ |
|Value of parameter k2 |$0.25$ |second^-1^ |
|Volume of compartment "compartment" |$1$ |litre |]
@@ -41,9 +41,9 @@
newcase[ "00012" ];
addCompartment[ compartment, size -> 1 ];
-addSpecies[ S1, initialAmount -> 1.0 10^-15, boundaryCondition -> True];
-addSpecies[ S2, initialAmount -> 2.0 10^-15, boundaryCondition -> True];
-addSpecies[ S3, initialAmount -> 1.0 10^-15];
+addSpecies[ S1, initialAmount -> 1.0 10^-2, boundaryCondition -> True];
+addSpecies[ S2, initialAmount -> 2.0 10^-2, boundaryCondition -> True];
+addSpecies[ S3, initialAmount -> 1.0 10^-2];
addParameter[ k1, value -> 0.75 ];
addParameter[ k2, value -> 0.25 ];
addReaction[ S1 + S2 -> S3, reversible -> False,
Modified: trunk/test-suite/cases/semantic/00012/00012-results.csv
===================================================================
--- trunk/test-suite/cases/semantic/00012/00012-results.csv 2009-03-17 23:16:10 UTC (rev 9406)
+++ trunk/test-suite/cases/semantic/00012/00012-results.csv 2009-03-17 23:17:50 UTC (rev 9407)
@@ -1,52 +1,52 @@
-time,case00012`S1,case00012`S2,case00012`S3
-0,1e-015,2e-015,1e-015
-0.32,1e-015,2e-015,9.23116e-016
-0.64,1e-015,2e-015,8.52144e-016
-0.96,1e-015,2e-015,7.86628e-016
-1.28,1e-015,2e-015,7.26149e-016
-1.6,1e-015,2e-015,6.7032e-016
-1.92,1e-015,2e-015,6.18783e-016
-2.24,1e-015,2e-015,5.71209e-016
-2.56,1e-015,2e-015,5.27292e-016
-2.88,1e-015,2e-015,4.86752e-016
-3.2,1e-015,2e-015,4.49329e-016
-3.52,1e-015,2e-015,4.14783e-016
-3.84,1e-015,2e-015,3.82893e-016
-4.16,1e-015,2e-015,3.53455e-016
-4.48,1e-015,2e-015,3.2628e-016
-4.8,1e-015,2e-015,3.01194e-016
-5.12,1e-015,2e-015,2.78037e-016
-5.44,1e-015,2e-015,2.56661e-016
-5.76,1e-015,2e-015,2.36928e-016
-6.08,1e-015,2e-015,2.18712e-016
-6.4,1e-015,2e-015,2.01897e-016
-6.72,1e-015,2e-015,1.86374e-016
-7.04,1e-015,2e-015,1.72045e-016
-7.36,1e-015,2e-015,1.58817e-016
-7.68,1e-015,2e-015,1.46607e-016
-8,1e-015,2e-015,1.35335e-016
-8.32,1e-015,2e-015,1.2493e-016
-8.64,1e-015,2e-015,1.15325e-016
-8.96,1e-015,2e-015,1.06459e-016
-9.28,1e-015,2e-015,9.82736e-017
-9.6,1e-015,2e-015,9.0718e-017
-9.92,1e-015,2e-015,8.37432e-017
-10.24,1e-015,2e-015,7.73047e-017
-10.56,1e-015,2e-015,7.13613e-017
-10.88,1e-015,2e-015,6.58748e-017
-11.2,1e-015,2e-015,6.08101e-017
-11.52,1e-015,2e-015,5.61348e-017
-11.84,1e-015,2e-015,5.18189e-017
-12.16,1e-015,2e-015,4.78349e-017
-12.48,1e-015,2e-015,4.41572e-017
-12.8,1e-015,2e-015,4.07622e-017
-13.12,1e-015,2e-015,3.76283e-017
-13.44,1e-015,2e-015,3.47353e-017
-13.76,1e-015,2e-015,3.20647e-017
-14.08,1e-015,2e-015,2.95994e-017
-14.4,1e-015,2e-015,2.73237e-017
-14.72,1e-015,2e-015,2.5223e-017
-15.04,1e-015,2e-015,2.32837e-017
-15.36,1e-015,2e-015,2.14936e-017
-15.68,1e-015,2e-015,1.98411e-017
-16,1e-015,2e-015,1.83156e-017
\ No newline at end of file
+time,S1,S2,S3
+0,0.01,0.02,0.01
+0.32,0.01,0.02,0.009277293656034377
+0.64,0.01,0.02,0.008610151616282386
+0.96,0.01,0.02,0.007994301894025602
+1.28,0.01,0.02,0.007425800948492695
+1.6,0.01,0.02,0.006901008432735009
+1.92,0.01,0.02,0.006416563882977724
+2.24,0.01,0.02,0.00596936520017886
+2.56,0.01,0.02,0.005556548786004656
+2.88,0.01,0.02,0.005175471206023734
+3.2,0.01,0.02,0.004823692262701883
+3.52,0.01,0.02,0.004498959369806865
+3.84,0.01,0.02,0.004199193128166053
+4.16,0.01,0.02,0.003922474010412533
+4.48,0.01,0.02,0.003667030069456571
+4.8,0.01,0.02,0.0034312255919747
+5.12,0.01,0.02,0.003213550624260025
+5.44,0.01,0.02,0.003012611303363425
+5.76,0.01,0.02,0.002827120931611945
+6.08,0.01,0.02,0.002655891737350819
+6.4,0.01,0.02,0.002497827269149761
+6.72,0.01,0.02,0.002351915374770454
+7.04,0.01,0.02,0.002217221719936675
+7.36,0.01,0.02,0.002092883805405055
+7.68,0.01,0.02,0.001978105444025291
+8,0.01,0.02,0.001872151662424159
+8.32,0.01,0.02,0.001774343994666675
+8.64,0.01,0.02,0.001684056137757788
+8.96,0.01,0.02,0.001600709941164976
+9.28,0.01,0.02,0.001523771704680999
+9.6,0.01,0.02,0.001452748760920478
+9.92,0.01,0.02,0.001387186320566642
+10.24,0.01,0.02,0.001326664560167018
+10.56,0.01,0.02,0.001270795933830029
+10.88,0.01,0.02,0.001219222691608188
+11.2,0.01,0.02,0.001171614588677049
+11.52,0.01,0.02,0.001127666770640857
+11.84,0.01,0.02,0.001087097821423623
+12.16,0.01,0.02,0.001049647961245465
+12.48,0.01,0.02,0.001015077383145113
+12.8,0.01,0.02,0.0009831647173966424
+13.12,0.01,0.02,0.0009537056139874563
+13.44,0.01,0.02,0.0009265114340805425
+13.76,0.01,0.02,0.0009014080420818913
+14.08,0.01,0.02,0.0008782346905781848
+14.4,0.01,0.02,0.00085684299100455
+14.72,0.01,0.02,0.0008370959634511358
+15.04,0.01,0.02,0.0008188671595240318
+15.36,0.01,0.02,0.0008020398526438452
+15.68,0.01,0.02,0.0007865062905970807
+16,0.01,0.02,0.0007721670055541013
Modified: trunk/test-suite/cases/semantic/00012/00012-sbml-l1v2.xml
===================================================================
--- trunk/test-suite/cases/semantic/00012/00012-sbml-l1v2.xml 2009-03-17 23:16:10 UTC (rev 9406)
+++ trunk/test-suite/cases/semantic/00012/00012-sbml-l1v2.xml 2009-03-17 23:17:50 UTC (rev 9407)
@@ -5,9 +5,9 @@
<compartment name="compartment" volume="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species name="S1" compartment="compartment" initialAmount="1e-015" units="substance" boundaryCondition="true"/>
- <species name="S2" compartment="compartment" initialAmount="2e-015" units="substance" boundaryCondition="true"/>
- <species name="S3" compartment="compartment" initialAmount="1e-015" units="substance"/>
+ <species name="S1" compartment="compartment" initialAmount="0.01" units="substance" boundaryCondition="true"/>
+ <species name="S2" compartment="compartment" initialAmount="0.02" units="substance" boundaryCondition="true"/>
+ <species name="S3" compartment="compartment" initialAmount="0.01" units="substance"/>
</listOfSpecies>
<listOfParameters>
<parameter name="k1" value="0.75"/>
Modified: trunk/test-suite/cases/semantic/00012/00012-sbml-l2v1.xml
===================================================================
--- trunk/test-suite/cases/semantic/00012/00012-sbml-l2v1.xml 2009-03-17 23:16:10 UTC (rev 9406)
+++ trunk/test-suite/cases/semantic/00012/00012-sbml-l2v1.xml 2009-03-17 23:17:50 UTC (rev 9407)
@@ -5,9 +5,9 @@
<compartment id="compartment" name="compartment" size="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1e-015" substanceUnits="substance" boundaryCondition="true"/>
- <species id="S2" name="S2" compartment="compartment" initialAmount="2e-015" substanceUnits="substance" boundaryCondition="true"/>
- <species id="S3" name="S3" compartment="compartment" initialAmount="1e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.01" substanceUnits="substance" boundaryCondition="true"/>
+ <species id="S2" name="S2" compartment="compartment" initialAmount="0.02" substanceUnits="substance" boundaryCondition="true"/>
+ <species id="S3" name="S3" compartment="compartment" initialAmount="0.01" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
<parameter id="k1" name="k1" value="0.75"/>
Modified: trunk/test-suite/cases/semantic/00012/00012-sbml-l2v2.xml
===================================================================
--- trunk/test-suite/cases/semantic/00012/00012-sbml-l2v2.xml 2009-03-17 23:16:10 UTC (rev 9406)
+++ trunk/test-suite/cases/semantic/00012/00012-sbml-l2v2.xml 2009-03-17 23:17:50 UTC (rev 9407)
@@ -5,9 +5,9 @@
<compartment id="compartment" name="compartment" size="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1e-015" substanceUnits="substance" boundaryCondition="true"/>
- <species id="S2" name="S2" compartment="compartment" initialAmount="2e-015" substanceUnits="substance" boundaryCondition="true"/>
- <species id="S3" name="S3" compartment="compartment" initialAmount="1e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.01" substanceUnits="substance" boundaryCondition="true"/>
+ <species id="S2" name="S2" compartment="compartment" initialAmount="0.02" substanceUnits="substance" boundaryCondition="true"/>
+ <species id="S3" name="S3" compartment="compartment" initialAmount="0.01" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
<parameter id="k1" name="k1" value="0.75"/>
Modified: trunk/test-suite/cases/semantic/00012/00012-sbml-l2v3.xml
===================================================================
--- trunk/test-suite/cases/semantic/00012/00012-sbml-l2v3.xml 2009-03-17 23:16:10 UTC (rev 9406)
+++ trunk/test-suite/cases/semantic/00012/00012-sbml-l2v3.xml 2009-03-17 23:17:50 UTC (rev 9407)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated 5-February-2008 17:29:45.5312500 -->
-<!-- Generated by MathSBML 2.7.1 (7 December 2007) -->
+<!-- Generated 17-March-2009 14:25:04.8437500 -->
+<!-- Generated by MathSBML 2.7.5 [2-May-2008] -->
<!-- Generated using Mathematica Version 5.2 for Microsoft Windows (June 20, 2005) -->
<sbml xmlns="http://www.sbml.org/sbml/level2/version3"
level="2"
@@ -17,7 +17,7 @@
name="compartment"
spatialDimensions="3"
units="volume"
- size="1"/>
+ size="1."/>
</listOfCompartments>
<listOfSpecies>
<species id="S1"
@@ -25,7 +25,7 @@
compartment="compartment"
boundaryCondition="true"
constant="false"
- initialAmount="1.e-15"
+ initialAmount="0.01"
substanceUnits="substance"
hasOnlySubstanceUnits="false"/>
<species id="S2"
@@ -33,7 +33,7 @@
compartment="compartment"
boundaryCondition="true"
constant="false"
- initialAmount="2.e-15"
+ initialAmount="0.02"
substanceUnits="substance"
hasOnlySubstanceUnits="false"/>
<species id="S3"
@@ -41,7 +41,7 @@
compartment="compartment"
boundaryCondition="false"
constant="false"
- initialAmount="1.e-15"
+ initialAmount="0.01"
substanceUnits="substance"
hasOnlySubstanceUnits="false"/>
</listOfSpecies>
Modified: trunk/test-suite/cases/semantic/00012/00012-sbml-l2v4.xml
===================================================================
--- trunk/test-suite/cases/semantic/00012/00012-sbml-l2v4.xml 2009-03-17 23:16:10 UTC (rev 9406)
+++ trunk/test-suite/cases/semantic/00012/00012-sbml-l2v4.xml 2009-03-17 23:17:50 UTC (rev 9407)
@@ -5,9 +5,9 @@
<compartment id="compartment" name="compartment" size="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1e-015" substanceUnits="substance" boundaryCondition="true"/>
- <species id="S2" name="S2" compartment="compartment" initialAmount="2e-015" substanceUnits="substance" boundaryCondition="true"/>
- <species id="S3" name="S3" compartment="compartment" initialAmount="1e-015" substanceUnits="substance"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.01" substanceUnits="substance" boundaryCondition="true"/>
+ <species id="S2" name="S2" compartment="compartment" initialAmount="0.02" substanceUnits="substance" boundaryCondition="true"/>
+ <species id="S3" name="S3" compartment="compartment" initialAmount="0.01" substanceUnits="substance"/>
</listOfSpecies>
<listOfParameters>
<parameter id="k1" name="k1" value="0.75"/>
Modified: trunk/test-suite/cases/semantic/00012/00012-settings.txt
===================================================================
--- trunk/test-suite/cases/semantic/00012/00012-settings.txt 2009-03-17 23:16:10 UTC (rev 9406)
+++ trunk/test-suite/cases/semantic/00012/00012-settings.txt 2009-03-17 23:17:50 UTC (rev 9407)
@@ -2,7 +2,7 @@
duration: 16.0
steps: 50
variables: S1, S2, S3
-absolute: 0.0000000000000000001
+absolute: 1.000000e-005
relative: 0.0001
amount: S1, S2, S3
concentration:
Modified: trunk/test-suite/cases/semantic/00013/00013-model.m
===================================================================
--- trunk/test-suite/cases/semantic/00013/00013-model.m 2009-03-17 23:16:10 UTC (rev 9406)
+++ trunk/test-suite/cases/semantic/00013/00013-model.m 2009-03-17 23:17:50 UTC (rev 9407)
@@ -21,9 +21,9 @@
The initial conditions are as follows:
[{width:30em,margin-left:5em}| |*Value* |*Units* |
-|Initial amount of S1 |$1.0 \x 10^-15$ |mole |
-|Initial amount of S2 |$2.0 \x 10^-15$ |mole |
-|Initial amount of S3 |$1.0 \x 10^-15$ |mole |
+|Initial amount of S1 |$1.0 \x 10^-1$ |mole |
+|Initial amount of S2 |$2.0 \x 10^-1$ |mole |
+|Initial amount of S3 |$1.0 \x 10^-1$ |mole |
|Value of parameter k1 |$0.75$ |litre mole^-1^ second^-1^ |
|Value of parameter k2 |$0.25$ |second^-1^ |
|Volume of compartment "compartment" |$1$ |litre |]
@@ -41,9 +41,9 @@
newcase[ "00013" ];
addCompartment[ compartment, size -> 1 ];
-addSpecies[ S1, initialAmount -> 1.0 10^-15, boundaryCondition -> True];
-addSpecies[ S2, initialAmount -> 2.0 10^-15, boundaryCondition -> True];
-addSpecies[ S3, initialAmount -> 1.0 10^-15, boundaryCondition -> True];
+addSpecies[ S1, initialAmount -> 1.0 10^-1, boundaryCondition -> True];
+addSpecies[ S2, initialAmount -> 2.0 10^-1, boundaryCondition -> True];
+addSpecies[ S3, initialAmount -> 1.0 10^-1, boundaryCondition -> True];
addParameter[ k1, value -> 0.75 ];
addParameter[ k2, value -> 0.25 ];
addReaction[ S1 + S2 -> S3, reversible -> False,
Modified: trunk/test-suite/cases/semantic/00013/00013-results.csv
===================================================================
--- trunk/test-suite/cases/semantic/00013/00013-results.csv 2009-03-17 23:16:10 UTC (rev 9406)
+++ trunk/test-suite/cases/semantic/00013/00013-results.csv 2009-03-17 23:17:50 UTC (rev 9407)
@@ -1,52 +1,52 @@
-time,case00013`S1,case00013`S2,case00013`S3
-0,1.e-15,2.e-15,1.e-15
-0.1,1.e-15,2.e-15,1.e-15
-0.2,1.e-15,2.e-15,1.e-15
-0.3,1.e-15,2.e-15,1.e-15
-0.4,1.e-15,2.e-15,1.e-15
-0.5,1.e-15,2.e-15,1.e-15
-0.6,1.e-15,2.e-15,1.e-15
-0.7,1.e-15,2.e-15,1.e-15
-0.8,1.e-15,2.e-15,1.e-15
-0.9,1.e-15,2.e-15,1.e-15
-1.,1.e-15,2.e-15,1.e-15
-1.1,1.e-15,2.e-15,1.e-15
-1.2,1.e-15,2.e-15,1.e-15
-1.3,1.e-15,2.e-15,1.e-15
-1.4,1.e-15,2.e-15,1.e-15
-1.5,1.e-15,2.e-15,1.e-15
-1.6,1.e-15,2.e-15,1.e-15
-1.7,1.e-15,2.e-15,1.e-15
-1.8,1.e-15,2.e-15,1.e-15
-1.9,1.e-15,2.e-15,1.e-15
-2.,1.e-15,2.e-15,1.e-15
-2.1,1.e-15,2.e-15,1.e-15
-2.2,1.e-15,2.e-15,1.e-15
-2.3,1.e-15,2.e-15,1.e-15
-2.4,1.e-15,2.e-15,1.e-15
-2.5,1.e-15,2.e-15,1.e-15
-2.6,1.e-15,2.e-15,1.e-15
-2.7,1.e-15,2.e-15,1.e-15
-2.8,1.e-15,2.e-15,1.e-15
-2.9,1.e-15,2.e-15,1.e-15
-3.,1.e-15,2.e-15,1.e-15
-3.1,1.e-15,2.e-15,1.e-15
-3.2,1.e-15,2.e-15,1.e-15
-3.3,1.e-15,2.e-15,1.e-15
-3.4,1.e-15,2.e-15,1.e-15
-3.5,1.e-15,2.e-15,1.e-15
-3.6,1.e-15,2.e-15,1.e-15
-3.7,1.e-15,2.e-15,1.e-15
-3.8,1.e-15,2.e-15,1.e-15
-3.9,1.e-15,2.e-15,1.e-15
-4.,1.e-15,2.e-15,1.e-15
-4.1,1.e-15,2.e-15,1.e-15
-4.2,1.e-15,2.e-15,1.e-15
-4.3,1.e-15,2.e-15,1.e-15
-4.4,1.e-15,2.e-15,1.e-15
-4.5,1.e-15,2.e-15,1.e-15
-4.6,1.e-15,2.e-15,1.e-15
-4.7,1.e-15,2.e-15,1.e-15
-4.8,1.e-15,2.e-15,1.e-15
-4.9,1.e-15,2.e-15,1.e-15
-5.,1.e-15,2.e-15,1.e-15
\ No newline at end of file
+time,S1,S2,S3
+0,0.1,0.2,0.1
+0.1,0.1,0.2,0.1
+0.2,0.1,0.2,0.1
+0.3,0.1,0.2,0.1
+0.4,0.1,0.2,0.1
+0.5,0.1,0.2,0.1
+0.6,0.1,0.2,0.1
+0.7,0.1,0.2,0.1
+0.8,0.1,0.2,0.1
+0.9,0.1,0.2,0.1
+1,0.1,0.2,0.1
+1.1,0.1,0.2,0.1
+1.2,0.1,0.2,0.1
+1.3,0.1,0.2,0.1
+1.4,0.1,0.2,0.1
+1.5,0.1,0.2,0.1
+1.6,0.1,0.2,0.1
+1.7,0.1,0.2,0.1
+1.8,0.1,0.2,0.1
+1.9,0.1,0.2,0.1
+2,0.1,0.2,0.1
+2.1,0.1,0.2,0.1
+2.2,0.1,0.2,0.1
+2.3,0.1,0.2,0.1
+2.4,0.1,0.2,0.1
+2.5,0.1,0.2,0.1
+2.6,0.1,0.2,0.1
+2.7,0.1,0.2,0.1
+2.8,0.1,0.2,0.1
+2.9,0.1,0.2,0.1
+3,0.1,0.2,0.1
+3.1,0.1,0.2,0.1
+3.2,0.1,0.2,0.1
+3.3,0.1,0.2,0.1
+3.4,0.1,0.2,0.1
+3.5,0.1,0.2,0.1
+3.6,0.1,0.2,0.1
+3.7,0.1,0.2,0.1
+3.8,0.1,0.2,0.1
+3.9,0.1,0.2,0.1
+4,0.1,0.2,0.1
+4.1,0.1,0.2,0.1
+4.2,0.1,0.2,0.1
+4.3,0.1,0.2,0.1
+4.4,0.1,0.2,0.1
+4.5,0.1,0.2,0.1
+4.6,0.1,0.2,0.1
+4.7,0.1,0.2,0.1
+4.8,0.1,0.2,0.1
+4.9,0.1,0.2,0.1
+5,0.1,0.2,0.1
Modified: trunk/test-suite/cases/semantic/00013/00013-sbml-l1v2.xml
===================================================================
--- trunk/test-suite/cases/semantic/00013/00013-sbml-l1v2.xml 2009-03-17 23:16:10 UTC (rev 9406)
+++ trunk/test-suite/cases/semantic/00013/00013-sbml-l1v2.xml 2009-03-17 23:17:50 UTC (rev 9407)
@@ -5,9 +5,9 @@
<compartment name="compartment" volume="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species name="S1" compartment="compartment" initialAmount="1e-015" units="substance" boundaryCondition="true"/>
- <species name="S2" compartment="compartment" initialAmount="2e-015" units="substance" boundaryCondition="true"/>
- <species name="S3" compartment="compartment" initialAmount="1e-015" units="substance" boundaryCondition="true"/>
+ <species name="S1" compartment="compartment" initialAmount="0.1" units="substance" boundaryCondition="true"/>
+ <species name="S2" compartment="compartment" initialAmount="0.2" units="substance" boundaryCondition="true"/>
+ <species name="S3" compartment="compartment" initialAmount="0.1" units="substance" boundaryCondition="true"/>
</listOfSpecies>
<listOfParameters>
<parameter name="k1" value="0.75"/>
Modified: trunk/test-suite/cases/semantic/00013/00013-sbml-l2v1.xml
===================================================================
--- trunk/test-suite/cases/semantic/00013/00013-sbml-l2v1.xml 2009-03-17 23:16:10 UTC (rev 9406)
+++ trunk/test-suite/cases/semantic/00013/00013-sbml-l2v1.xml 2009-03-17 23:17:50 UTC (rev 9407)
@@ -5,9 +5,9 @@
<compartment id="compartment" name="compartment" size="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1e-015" substanceUnits="substance" boundaryCondition="true"/>
- <species id="S2" name="S2" compartment="compartment" initialAmount="2e-015" substanceUnits="substance" boundaryCondition="true"/>
- <species id="S3" name="S3" compartment="compartment" initialAmount="1e-015" substanceUnits="substance" boundaryCondition="true"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.1" substanceUnits="substance" boundaryCondition="true"/>
+ <species id="S2" name="S2" compartment="compartment" initialAmount="0.2" substanceUnits="substance" boundaryCondition="true"/>
+ <species id="S3" name="S3" compartment="compartment" initialAmount="0.1" substanceUnits="substance" boundaryCondition="true"/>
</listOfSpecies>
<listOfParameters>
<parameter id="k1" name="k1" value="0.75"/>
Modified: trunk/test-suite/cases/semantic/00013/00013-sbml-l2v2.xml
===================================================================
--- trunk/test-suite/cases/semantic/00013/00013-sbml-l2v2.xml 2009-03-17 23:16:10 UTC (rev 9406)
+++ trunk/test-suite/cases/semantic/00013/00013-sbml-l2v2.xml 2009-03-17 23:17:50 UTC (rev 9407)
@@ -5,9 +5,9 @@
<compartment id="compartment" name="compartment" size="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1e-015" substanceUnits="substance" boundaryCondition="true"/>
- <species id="S2" name="S2" compartment="compartment" initialAmount="2e-015" substanceUnits="substance" boundaryCondition="true"/>
- <species id="S3" name="S3" compartment="compartment" initialAmount="1e-015" substanceUnits="substance" boundaryCondition="true"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.1" substanceUnits="substance" boundaryCondition="true"/>
+ <species id="S2" name="S2" compartment="compartment" initialAmount="0.2" substanceUnits="substance" boundaryCondition="true"/>
+ <species id="S3" name="S3" compartment="compartment" initialAmount="0.1" substanceUnits="substance" boundaryCondition="true"/>
</listOfSpecies>
<listOfParameters>
<parameter id="k1" name="k1" value="0.75"/>
Modified: trunk/test-suite/cases/semantic/00013/00013-sbml-l2v3.xml
===================================================================
--- trunk/test-suite/cases/semantic/00013/00013-sbml-l2v3.xml 2009-03-17 23:16:10 UTC (rev 9406)
+++ trunk/test-suite/cases/semantic/00013/00013-sbml-l2v3.xml 2009-03-17 23:17:50 UTC (rev 9407)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated 5-February-2008 17:32:34.0937500 -->
-<!-- Generated by MathSBML 2.7.1 (7 December 2007) -->
+<!-- Generated 17-March-2009 14:25:08.2343750 -->
+<!-- Generated by MathSBML 2.7.5 [2-May-2008] -->
<!-- Generated using Mathematica Version 5.2 for Microsoft Windows (June 20, 2005) -->
<sbml xmlns="http://www.sbml.org/sbml/level2/version3"
level="2"
@@ -17,7 +17,7 @@
name="compartment"
spatialDimensions="3"
units="volume"
- size="1"/>
+ size="1."/>
</listOfCompartments>
<listOfSpecies>
<species id="S1"
@@ -25,7 +25,7 @@
compartment="compartment"
boundaryCondition="true"
constant="false"
- initialAmount="1.e-15"
+ initialAmount="0.1"
substanceUnits="substance"
hasOnlySubstanceUnits="false"/>
<species id="S2"
@@ -33,7 +33,7 @@
compartment="compartment"
boundaryCondition="true"
constant="false"
- initialAmount="2.e-15"
+ initialAmount="0.2"
substanceUnits="substance"
hasOnlySubstanceUnits="false"/>
<species id="S3"
@@ -41,7 +41,7 @@
compartment="compartment"
boundaryCondition="true"
constant="false"
- initialAmount="1.e-15"
+ initialAmount="0.1"
substanceUnits="substance"
hasOnlySubstanceUnits="false"/>
</listOfSpecies>
Modified: trunk/test-suite/cases/semantic/00013/00013-sbml-l2v4.xml
===================================================================
--- trunk/test-suite/cases/semantic/00013/00013-sbml-l2v4.xml 2009-03-17 23:16:10 UTC (rev 9406)
+++ trunk/test-suite/cases/semantic/00013/00013-sbml-l2v4.xml 2009-03-17 23:17:50 UTC (rev 9407)
@@ -5,9 +5,9 @@
<compartment id="compartment" name="compartment" size="1" units="volume"/>
</listOfCompartments>
<listOfSpecies>
- <species id="S1" name="S1" compartment="compartment" initialAmount="1e-015" substanceUnits="substance" boundaryCondition="true"/>
- <species id="S2" name="S2" compartment="compartment" initialAmount="2e-015" substanceUnits="substance" boundaryCondition="true"/>
- <species id="S3" name="S3" compartment="compartment" initialAmount="1e-015" substanceUnits="substance" boundaryCondition="true"/>
+ <species id="S1" name="S1" compartment="compartment" initialAmount="0.1" substanceUnits="substance" boundaryCondition="true"/>
+ <species id="S2" name="S2" compartment="compartment" initialAmount="0.2" substanceUnits="substance" boundaryCondition="true"/>
+ <species id="S3" name="S3" compartment="compartment" initialAmount="0.1" substanceUnits="substance" boundaryCondition="true"/>
</listOfSpecies>
<listOfParameters>
<parameter id="k1" name="k1" value="0.75"/>
Modified: trunk/test-suite/cases/semantic/00013/00013-settings.txt
===================================================================
--- trunk/test-suite/cases/semantic/00013/00013-settings.txt 2009-03-17 23:16:10 UTC (rev 9406)
+++ trunk/test-suite/cases/semantic/00013/00013-settings.txt 2009-03-17 23:17:50 UTC (rev 9407)
@@ -2,7 +2,7 @@
duration: 5.0
steps: 50
variables: S1, S2, S3
-absolute: 0.0000000000000000001
+absolute: 1.000000e-004
relative: 0.0001
amount: S1, S2, S3
concentration:
Modified: trunk/test-suite/cases/semantic/00014/00014-model.m
===================================================================
--- trunk/test-suite/cases/semantic/00014/00014-model.m 2009-03-17 23:16:10 UTC (rev 9406)
+++ trunk/test-suite/cases/semantic/00014/00014-model.m 2009-03-17 23:17:50 UTC (rev 9407)
@@ -20,10 +20,10 @@
The initial conditions are as follows:
[{width:30em,margin-left:5em}| |*Value* |*Units* |
-|Initial amount of S1 |$1.0 \x 10^-15$ |mole |
-|Initial amount of S2 |$2.0 \x 10^-15$ |mole |
-|Initial amount of S3 |$1.0 \x 10^-15$ |mole |
-|Value of parameter k1 |$1.0 \x 10^15$ |litre^2^ mole^-2^ second^-1^ |
+|Initial amount of S1 |$1.0 \x 10^-4$ |mole |
+|Initial amount of S2 |$2.0 \x 10^-4$ |mole |
+|Initial amount of S3 |$1.0 \x 10^-4$ |mole |
+|Value of parameter k1 |$1.0 \x 10^4$ |litre^2^ mole^-2^ second^-1^ |
|Value of parameter k2 |$0.25$ |second^-1^ |
|Volume of compartment "compartment" |$1$ |litre |]
@@ -37,10 +37,10 @@
newcase[ "00014" ];
addCompartment[ compartment, size -> 1 ];
-addSpecies[ S1, initialAmount -> 1.0 10^-15];
-addSpecies[ S2, initialAmount -> 2.0 10^-15];
-addSpecies[ S3, initialAmount -> 1.0 10^-15];
-addParameter[ k1, value -> 1.0 10^15 ];
+addSpecies[ S1, initialAmount -> 1.0 10^-4];
+addSpecies[ S2, initialAmount -> 2.0 10^-4];
+addSpecies[ S3, initialAmount -> 1.0 10^-4];
+addParameter[ k1, value -> 1.0 10^4 ];
addParameter[ k2, value -> 0.25 ];
addReaction[ 2S1 + S2 -> S3, reversible -> False,
kineticLaw -> k1 * S1 * S1 * S2 * compartment ];
Modified: trunk/test-suite/cases/semantic/00014/00014-plot.eps
===================================================================
--- trunk/test-suite/cases/semantic/00014/00014-plot.eps 2009-03-17 23:16:10 UTC (rev 9406)
+++ trunk/test-suite/cases/semantic/00014/00014-plot.eps 2009-03-17 23:17:50 UTC (rev 9407)
@@ -1,2138 +1,2070 @@
-%!PS-Adobe-2.0 EPSF-1.2
-%%BoundingBox: 88 4 376 144
-%%HiResBoundingBox: 88 4 376 143.562
-%%Creator: (Mathematica 5.2 for X)
-%%CreationDate: (Thursday, August 16, 2007) (16:16:46)
-%%Title: Clipboard
-%%DocumentNeededResources: font Math1Mono
-%%+ font Courier
-%%DocumentSuppliedResources:
-%%DocumentNeededFonts: Math1Mono
-%%+ Courier
-%%DocumentSuppliedFonts:
-%%DocumentFonts: Math1Mono
-%%+ Courier
-%%EndComments
-0 147.562 translate 1 -1 scale
-150 dict begin
-/Mfixwid true def
-/Mrot 0 def
-/Mpstart {
- MathPictureStart
-} bind def
-/Mpend {
- MathPictureEnd
-} bind def
-/Mscale {
- 0 1 0 1
- 5 -1 roll
- MathScale
-} bind def
-/Plain /Courier findfont def
-/Bold /Courier-Bold findfont def
-/Italic /Courier-Oblique findfont def
-/MathPictureStart {
- /Mimatrix
- matrix currentmatrix
- def
- gsave
- newpath
- Mleft
- Mbottom
- translate
- /Mtmatrix
- matrix currentmatrix
- def
- Plain
- Mfontsize scalefont
- setfont
- 0 setgray
- 0 setlinewidth
-} bind def
-/MathPictureEnd {
- grestore
-} bind def
-/MathSubStart {
- Momatrix
- Mgmatrix Mtmatrix
- Mleft Mbottom
- Mwidth Mheight
- 9 -2 roll
- moveto
- Mtmatrix setmatrix
- currentpoint
- Mgmatrix setmatrix
- 11 -2 roll
- moveto
- Mtmatrix setmatrix
- currentpoint
- 2 copy translate
- /Mtmatrix matrix currentmatrix def
- /Mleft 0 def
- /Mbottom 0 def
- 3 -1 roll
- exch sub
- /Mheight exch def
- sub
- /Mwidth exch def
-} bind def
-/MathSubEnd {
- /Mheight exch def
- /Mwidth exch def
- /Mbottom exch def
- /Mleft exch def
- /Mtmatrix exch def
- dup setmatrix
- /Mgmatrix exch def
- /Momatrix exch def
-} bind def
-/Mdot {
- moveto
- 0 0 rlineto
- stroke
-} bind def
-/Mtetra {
- moveto
- lineto
- lineto
- lineto
- fill
-} bind def
-/Metetra {
- moveto
- lineto
- lineto
- lineto
- closepath
- gsave
- fill
- grestore
- 0 setgray
- stroke
-} bind def
-/Mistroke {
- flattenpath
- 0 0 0
- {
- 4 2 roll
- pop pop
- }
- {
- 4 -1 roll
- 2 index
- sub dup mul
- 4 -1 roll
- 2 index
- sub dup mul
- add sqrt
- 4 -1 roll
- add
- 3 1 roll
- }
- {
- stop
- }
- {
- stop
- }
- pathforall
- pop pop
- currentpoint
- stroke
- moveto
- currentdash
- 3 -1 roll
- add
- setdash
-} bind def
-/Mfstroke {
- stroke
- currentdash
- pop 0
- setdash
-} bind def
-/Mrotsboxa {
- gsave
- dup
- /Mrot
- exch def
- Mrotcheck
- Mtmatrix
- dup
- setmatrix
- 7 1 roll
- 4 index
- 4 index
- translate
- rotate
- 3 index
- -1 mul
- 3 index
- -1 mul
- translate
- /Mtmatrix
- matrix
- currentmatrix
- def
- grestore
- Msboxa
- 3 -1 roll
- /Mtmatrix
- exch def
- /Mrot
- 0 def
-} bind def
-/Msboxa {
- newpath
- 5 -1 roll
- Mvboxa
- pop
- Mboxout
- 6 -1 roll
- 5 -1 roll
- 4 -1 roll
- Msboxa1
- 5 -3 roll
- Msboxa1
- Mboxrot
- [
- 7 -2 roll
- 2 copy
- [
- 3 1 roll
- 10 -1 roll
- 9 -1 roll
- ]
- 6 1 roll
- 5 -2 roll
- ]
-} bind def
-/Msboxa1 {
- sub
- 2 div
- dup
- 2 index
- 1 add
- mul
- 3 -1 roll
- -1 add
- 3 -1 roll
- mul
-} bind def
-/Mvboxa {
- Mfixwid
- {
- Mvboxa1
- }
- {
- dup
- Mwidthcal
- 0 exch
- {
- add
- }
- forall
- exch
- Mvboxa1
- 4 index
- 7 -1 roll
- add
- 4 -1 roll
- pop
- 3 1 roll
- }
- ifelse
-} bind def
-/Mvboxa1 {
- gsave
- newpath
- [ true
- 3 -1 roll
- {
- Mbbox
- 5 -1 roll
- {
- 0
- 5 1 roll
- }
- {
- 7 -1 roll
- exch sub
- (m) stringwidth pop
- .3 mul
- sub
- 7 1 roll
- 6 -1 roll
- 4 -1 roll
- Mmin
- 3 -1 roll
- 5 index
- add
- 5 -1 roll
- 4 -1 roll
- Mmax
- 4 -1 roll
- }
- ifelse
- false
- }
- forall
- { stop } if
- counttomark
- 1 add
- 4 roll
- ]
- grestore
-} bind def
-/Mbbox {
- 0 0 moveto
- false charpath
- flattenpath
- pathbbox
- newpath
-} bind def
-/Mmin {
- 2 copy
- gt
- { exch } if
- pop
-} bind def
-/Mmax {
- 2 copy
- lt
- { exch } if
- pop
-} bind def
-/Mrotshowa {
- dup
- /Mrot
- exch def
- Mrotcheck
- Mtmatrix
- dup
- setmatrix
- 7 1 roll
- 4 index
- 4 index
- translate
- rotate
- 3 index
- -1 mul
- 3 index
- -1 mul
- translate
- /Mtmatrix
- matrix
- currentmatrix
- def
- Mgmatrix setmatrix
- Mshowa
- /Mtmatrix
- exch def
- /Mrot 0 def
-} bind def
-/Mshowa {
- 4 -2 roll
- moveto
- 2 index
- Mtmatrix setmatrix
- Mvboxa
- 7 1 roll
- Mboxout
- 6 -1 roll
- 5 -1 roll
- 4 -1 roll
- Mshowa1
- 4 1 roll
- Mshowa1
- rmoveto
- currentpoint
- Mfixwid
- {
- Mshowax
- }
- {
- Mshoway
- }
- ifelse
- pop pop pop pop
- Mgmatrix setmatrix
-} bind def
-/Mshowax {
- 0 1
- 4 index length
- -1 add
- {
- 2 index
- 4 index
- 2 index
- get
- 3 index
- add
- moveto
- 4 index
- exch get
- show
- } for
-} bind def
-/Mshoway {
- 3 index
- Mwidthcal
- 5 1 roll
- 0 1
- 4 index length
- -1 add
- {
- 2 index
- 4 index
- 2 index
- get
- 3 index
- add
- moveto
- 4 index
- exch get
- [
- 6 index
- aload
- length
- 2 add
- -1 roll
- {
- pop
- Strform
- stringwidth
- pop
- neg
- exch
- add
- 0 rmoveto
- }
- exch
- kshow
- cleartomark
- } for
- pop
-} bind def
-/Mwidthcal {
- [
- exch
- {
- Mwidthcal1
- }
- forall
- ]
- [
- exch
- dup
- Maxlen
- -1 add
- 0 1
- 3 -1 roll
- {
- [
- exch
- 2 index
- {
- 1 index
- Mget
- exch
- }
- forall
- pop
- Maxget
- exch
- }
- for
- pop
- ]
- Mreva
-} bind def
-/Mreva {
- [
- exch
- aload
- length
- -1 1
- {1 roll}
- for
- ]
-} bind def
-/Mget {
- 1 index
- length
- -1 add
- 1 index
- ge
- {
- get
- }
- {
- pop pop
- 0
- }
- ifelse
-} bind def
-/Maxlen {
- [
- exch
- {
- length
- }
- forall
- Maxget
-} bind def
-/Maxget {
- counttomark
- -1 add
- 1 1
- 3 -1 roll
- {
- pop
- Mmax
- }
- for
- exch
- pop
-} bind def
-/Mwidthcal1 {
- [
- exch
- {
- Strform
- stringwidth
- pop
- }
- forall
- ]
-} bind def
-/Strform {
- /tem (x) def
- tem 0
- 3 -1 roll
- put
- tem
-} bind def
-/Mshowa1 {
- 2 copy
- add
- 4 1 roll
- sub
- mul
- sub
- -2 div
-} bind def
-/MathScale {
- Mwidth
- Mheight
- Mlp
- translate
- scale
- /yscale exch def
- /ybias exch def
- /xscale exch def
- /xbias exch def
- /Momatrix
- xscale yscale matrix scale
- xbias ybias matrix translate
- matrix concatmatrix def
- /Mgmatrix
- matrix currentmatrix
- def
-} bind def
-/Mlp {
- 3 copy
- Mlpfirst
- {
- Mnodistort
- {
- Mmin
- dup
- } if
- 4 index
- 2 index
- 2 index
- Mlprun
- 11 index
- 11 -1 roll
- 10 -4 roll
- Mlp1
- 8 index
- 9 -5 roll
- Mlp1
- 4 -1 roll
- and
- { exit } if
- 3 -1 roll
- pop pop
- } loop
- exch
- 3 1 roll
- 7 -3 roll
- pop pop pop
-} bind def
-/Mlpfirst {
- 3 -1 roll
- dup length
- 2 copy
- -2 add
- get
- aload
- pop pop pop
- 4 -2 roll
- -1 add
- get
- aload
- pop pop pop
- 6 -1 roll
- 3 -1 roll
- 5 -1 roll
- sub
- dup /MsaveAx exch def
- div
- 4 1 roll
- exch sub
- dup /MsaveAy exch def
- div
-} bind def
-/Mlprun {
- 2 copy
- 4 index
- 0 get
- dup
- 4 1 roll
- Mlprun1
- 3 copy
- 8 -2 roll
- 9 -1 roll
- {
- 3 copy
- Mlprun1
- 3 copy
- 11 -3 roll
- /gt Mlpminmax
- 8 3 roll
- 11 -3 roll
- /lt Mlpminmax
- 8 3 roll
- } forall
- pop pop pop pop
- 3 1 roll
- pop pop
- aload pop
- 5 -1 roll
- aload pop
- exch
- 6 -1 roll
- Mlprun2
- 8 2 roll
- 4 -1 roll
- Mlprun2
- 6 2 roll
- 3 -1 roll
- Mlprun2
- 4 2 roll
- exch
- Mlprun2
- 6 2 roll
-} bind def
-/Mlprun1 {
- aload pop
- exch
- 6 -1 roll
- 5 -1 roll
- mul add
- 4 -2 roll
- mul
- 3 -1 roll
- add
-} bind def
-/Mlprun2 {
- 2 copy
- add 2 div
- 3 1 roll
- exch sub
-} bind def
-/Mlpminmax {
- cvx
- 2 index
- 6 index
- 2 index
- exec
- {
- 7 -3 roll
- 4 -1 roll
- } if
- 1 index
- 5 index
- 3 -1 roll
- exec
- {
- 4 1 roll
- pop
- 5 -1 roll
- aload
- pop pop
- 4 -1 roll
- aload pop
- [
- 8 -2 roll
- pop
- 5 -2 roll
- pop
- 6 -2 roll
- pop
- 5 -1 roll
- ]
- 4 1 roll
- pop
- }
- {
- pop pop pop
- } ifelse
-} bind def
-/Mlp1 {
- 5 index
- 3 index sub
- 5 index
- 2 index mul
- 1 index
- le
- 1 index
- 0 le
- or
- dup
- not
- {
- 1 index
- 3 index div
- .99999 mul
- 8 -1 roll
- pop
- 7 1 roll
- }
- if
- 8 -1 roll
- 2 div
- 7 -2 roll
- pop sub
- 5 index
- 6 -3 roll
- pop pop
- mul sub
- exch
-} bind def
-/intop 0 def
-/inrht 0 def
-/inflag 0 def
-/outflag 0 def
-/xadrht 0 def
-/xadlft 0 def
-/yadtop 0 def
-/yadbot 0 def
-/Minner {
- outflag
- 1
- eq
- {
- /outflag 0 def
- /intop 0 def
- /inrht 0 def
- } if
- 5 index
- gsave
- Mtmatrix setmatrix
- Mvboxa pop
- grestore
- 3 -1 roll
- pop
- dup
- intop
- gt
- {
- /intop
- exch def
- }
- { pop }
- ifelse
- dup
- inrht
- gt
- {
- /inrht
- exch def
- }
- { pop }
- ifelse
- pop
- /inflag
- 1 def
-} bind def
-/Mouter {
- /xadrht 0 def
- /xadlft 0 def
- /yadtop 0 def
- /yadbot 0 def
- inflag
- 1 eq
- {
- dup
- 0 lt
- {
- dup
- intop
- mul
- neg
- /yadtop
- exch def
- } if
- dup
- 0 gt
- {
- dup
- intop
- mul
- /yadbot
- exch def
- }
- if
- pop
- dup
- 0 lt
- {
- dup
- inrht
- mul
- neg
- /xadrht
- exch def
- } if
- dup
- 0 gt
- {
- dup
- inrht
- mul
- /xadlft
- exch def
- } if
- pop
- /outflag 1 def
- }
- { pop pop}
- ifelse
- /inflag 0 def
- /inrht 0 def
- /intop 0 def
-} bind def
-/Mboxout {
- outflag
- 1
- eq
- {
- 4 -1
- roll
- xadlft
- leadjust
- add
- sub
- 4 1 roll
- 3 -1
- roll
- yadbot
- leadjust
- add
- sub
- 3 1
- roll
- exch
- xadrht
- leadjust
- add
- add
- exch
- yadtop
- leadjust
- add
- add
- /outflag 0 def
- /xadlft 0 def
- /yadbot 0 def
- /xadrht 0 def
- /yadtop 0 def
- } if
-} bind def
-/leadjust {
- (m) stringwidth pop
- .5 mul
-} bind def
-/Mrotcheck {
- dup
- 90
- eq
- {
- yadbot
- /yadbot
- xadrht
- def
- /xadrht
- yadtop
- def
- /yadtop
- xadlft
- def
- /xadlft
- exch
- def
- }
- if
- dup
- cos
- 1 index
- sin
- Checkaux
- dup
- cos
- 1 index
- sin neg
- exch
- Checkaux
- 3 1 roll
- pop pop
-} bind def
-/Checkaux {
- 4 index
- exch
- 4 index
- mul
- 3 1 roll
- mul add
- 4 1 roll
-} bind def
-/Mboxrot {
- Mrot
- 90 eq
- {
- brotaux
- 4 2
- roll
- }
- if
- Mrot
- 180 eq
- {
- 4 2
- roll
- brotaux
- 4 2
- roll
- brotaux
- }
- if
- Mrot
- 270 eq
- {
- 4 2
- roll
- brotaux
- }
- if
-} bind def
-/brotaux {
- neg
- exch
- neg
-} bind def
-/Mabsproc {
- 0
- matrix defaultmatrix
- dtransform idtransform
- dup mul exch
- dup mul
- add sqrt
-} bind def
-/Mabswid {
- Mabsproc
- setlinewidth
-} bind def
-/Mabsdash {
- exch
- [
- exch
- {
- Mabsproc
- }
- forall
- ]
- exch
- setdash
-} bind def
-/MBeginOrig { Momatrix concat} bind def
-/MEndOrig { Mgmatrix setmatrix} bind def
-/sampledsound where
-{ pop}
-{ /sampledsound {
-exch
-pop
-exch
-5 1 roll
-mul
-4 idiv
-mul
-2 idiv
-exch pop
-exch
-/Mtempproc exch def
-{ Mtempproc pop }
-repeat
-} bind def
-} ifelse
-
-/MFill {
- 0 0 moveto
- Mwidth 0 lineto
- Mwidth Mheight lineto
- 0 Mheight lineto
- fill
-} bind def
-
-/MPlotRegion {
- 3 index
- Mwidth mul
- 2 index
- Mheight mul
- translate
- exch sub
- Mheight mul
- /Mheight
- exch def
- exch sub
- Mwidth mul
- /Mwidth
- exch def
-} bind def
-
-/Mcharproc
-{
- currentfile
- (x)
- readhexstring
- pop
- 0 get
- exch
- div
-} bind def
-
-/Mshadeproc
-{
- dup
- 3 1
- roll
- {
- dup
- Mcharproc
- 3 1
- roll
- } repeat
- 1 eq
- {
- setgray
- }
- {
- 3 eq
- {
- setrgbcolor
- }
- {
- setcmykcolor
- } ifelse
- } ifelse
-} bind def
-
-/Mrectproc
-{
- 3 index
- 2 index
- moveto
- 2 index
- 3 -1
- roll
- lineto
- dup
- 3 1
- roll
- lineto
- lineto
- fill
-} bind def
-
-/_Mcolorimage
-{
- 7 1
- roll
- pop
- pop
- matrix
- invertmatrix
- concat
- 2 exch exp
- 1 sub
- 3 1 roll
- 1 1
- 2 index
- {
- 1 1
- 4 index
- {
- dup
- 1 sub
- exch
- 2 index
- dup
- 1 sub
- exch
- 7 index
- 9 index
- Mshadeproc
- Mrectproc
- } for
- pop
- } for
- pop pop pop pop
-} bind def
-
-/_Mimage
-{
- pop
- matrix
- invertmatrix
- concat
- 2 exch exp
- 1 sub
- 3 1 roll
- 1 1
- 2 index
- {
- 1 1
- 4 index
- {
- dup
- 1 sub
- exch
- 2 index
- dup
- 1 sub
- exch
- 7 index
- Mcharproc
- setgray
- Mrectproc
- } for
- pop
- } for
- pop pop pop
-} bind def
-
-/Mimage {
- 4 index
- 4 index
- mul 1600 gt
- { image }
- { _Mimage }
- ifelse
-} def
-
-/Mcolorimage {
- 6 index
- 6 index
- mul 1600 gt
- { colorimage }
- { _Mcolorimage }
- ifelse
-} def
-
-/g { setgray} bind def
-/k { setcmykcolor} bind def
-/p { gsave} bind def
-/r { setrgbcolor} bind def
-/w { setlinewidth} bind def
-/C { curveto} bind def
-/F { fill} bind def
-/L { lineto} bind def
-/rL { rlineto} bind def
-/P { grestore} bind def
-/s { stroke} bind def
-/S { show} bind def
-/N {currentpoint 3 -1 roll show moveto} bind def
-/Msf { findfont exch scalefont [1 0 0 -1 0 0 ] makefont setfont} bind def
-/m { moveto} bind def
-/Mr { rmoveto} bind def
-/Mx {currentpoint exch pop moveto} bind def
-/My {currentpoint pop exch moveto} bind def
-/X {0 rmoveto} bind def
-/Y {0 exch rmoveto} bind def
-gsave
-newpath
- 143.312 112.562 moveto
- 277.500 112.562 lineto
- 277.500 29.625 lineto
- 143.312 29.625 lineto
- 143.312 112.562 lineto
-closepath
-clip newpath
-grestore
-gsave
-ne...
[truncated message content] |