Menu
▾
▴
sbml-svn — SVN commit notification list for the SBML project.
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
(22) |
2
(3) |
3
(1) |
|
4
|
5
(3) |
6
(5) |
7
(3) |
8
(13) |
9
|
10
(8) |
|
11
(2) |
12
(11) |
13
(4) |
14
(3) |
15
|
16
(1) |
17
|
|
18
|
19
(3) |
20
(6) |
21
(3) |
22
|
23
(5) |
24
(1) |
|
25
(8) |
26
(8) |
27
(17) |
28
(3) |
29
(7) |
30
|
|
|
From: <mh...@us...> - 2010-04-29 18:47:34
|
Revision: 11233
http://sbml.svn.sourceforge.net/sbml/?rev=11233&view=rev
Author: mhucka
Date: 2010-04-29 18:47:28 +0000 (Thu, 29 Apr 2010)
Log Message:
-----------
New badge logos for use in documents.
Added Paths:
-----------
trunk/project/tex/logos/sbml-badge.eps
trunk/project/tex/logos/sbml-badge.jpg
trunk/project/tex/logos/sbml-badge.pdf
Added: trunk/project/tex/logos/sbml-badge.eps
===================================================================
--- trunk/project/tex/logos/sbml-badge.eps (rev 0)
+++ trunk/project/tex/logos/sbml-badge.eps 2010-04-29 18:47:28 UTC (rev 11233)
@@ -0,0 +1,9815 @@
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sar...@us...> - 2010-04-29 14:08:25
|
Revision: 11232
http://sbml.svn.sourceforge.net/sbml/?rev=11232&view=rev
Author: sarahkeating
Date: 2010-04-29 14:08:18 +0000 (Thu, 29 Apr 2010)
Log Message:
-----------
updated project files
Modified Paths:
--------------
trunk/libsbml/win/msvc7/expat/libsbml_csharp.vcproj
trunk/libsbml/win/msvc7/expat/libsbml_java.vcproj
trunk/libsbml/win/msvc7/expat/libsbml_python.vcproj
trunk/libsbml/win/msvc7/libxml2/libsbml_csharp.vcproj
trunk/libsbml/win/msvc7/libxml2/libsbml_java.vcproj
trunk/libsbml/win/msvc7/libxml2/libsbml_python.vcproj
trunk/libsbml/win/msvc7/xerces/libsbml_csharp.vcproj
trunk/libsbml/win/msvc7/xerces/libsbml_java.vcproj
trunk/libsbml/win/msvc7/xerces/libsbml_python.vcproj
trunk/libsbml/win/msvc8/expat/libsbml.vcproj
trunk/libsbml/win/msvc8/expat/libsbml_csharp.vcproj
trunk/libsbml/win/msvc8/expat/libsbml_java.vcproj
trunk/libsbml/win/msvc8/expat/libsbml_python.vcproj
trunk/libsbml/win/msvc8/libxml2/libsbml.vcproj
trunk/libsbml/win/msvc8/libxml2/libsbml_csharp.vcproj
trunk/libsbml/win/msvc8/libxml2/libsbml_java.vcproj
trunk/libsbml/win/msvc8/libxml2/libsbml_python.vcproj
trunk/libsbml/win/msvc8/xerces/libsbml.vcproj
trunk/libsbml/win/msvc8/xerces/libsbml_csharp.vcproj
trunk/libsbml/win/msvc8/xerces/libsbml_java.vcproj
trunk/libsbml/win/msvc8/xerces/libsbml_python.vcproj
trunk/libsbml/win/msvc9/expat/libsbml.vcproj
trunk/libsbml/win/msvc9/expat/libsbml_csharp.vcproj
trunk/libsbml/win/msvc9/expat/libsbml_java.vcproj
trunk/libsbml/win/msvc9/expat/libsbml_python.vcproj
trunk/libsbml/win/msvc9/libxml2/libsbml.vcproj
trunk/libsbml/win/msvc9/libxml2/libsbml_csharp.vcproj
trunk/libsbml/win/msvc9/libxml2/libsbml_java.vcproj
trunk/libsbml/win/msvc9/libxml2/libsbml_python.vcproj
trunk/libsbml/win/msvc9/xerces/libsbml.vcproj
trunk/libsbml/win/msvc9/xerces/libsbml_csharp.vcproj
trunk/libsbml/win/msvc9/xerces/libsbml_java.vcproj
trunk/libsbml/win/msvc9/xerces/libsbml_python.vcproj
Modified: trunk/libsbml/win/msvc7/expat/libsbml_csharp.vcproj
===================================================================
--- trunk/libsbml/win/msvc7/expat/libsbml_csharp.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc7/expat/libsbml_csharp.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -606,6 +606,9 @@
RelativePath="..\..\..\src\validator\Validator.cpp">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp">
</File>
<File
@@ -1090,6 +1093,9 @@
RelativePath="..\..\..\src\validator\Validator.h">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h">
</File>
<File
Modified: trunk/libsbml/win/msvc7/expat/libsbml_java.vcproj
===================================================================
--- trunk/libsbml/win/msvc7/expat/libsbml_java.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc7/expat/libsbml_java.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -606,6 +606,9 @@
RelativePath="..\..\..\src\validator\Validator.cpp">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp">
</File>
<File
@@ -1090,6 +1093,9 @@
RelativePath="..\..\..\src\validator\Validator.h">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h">
</File>
<File
Modified: trunk/libsbml/win/msvc7/expat/libsbml_python.vcproj
===================================================================
--- trunk/libsbml/win/msvc7/expat/libsbml_python.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc7/expat/libsbml_python.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -608,6 +608,9 @@
RelativePath="..\..\..\src\validator\Validator.cpp">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp">
</File>
<File
@@ -1092,6 +1095,9 @@
RelativePath="..\..\..\src\validator\Validator.h">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h">
</File>
<File
Modified: trunk/libsbml/win/msvc7/libxml2/libsbml_csharp.vcproj
===================================================================
--- trunk/libsbml/win/msvc7/libxml2/libsbml_csharp.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc7/libxml2/libsbml_csharp.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -612,6 +612,9 @@
RelativePath="..\..\..\src\validator\Validator.cpp">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp">
</File>
<File
@@ -1102,6 +1105,9 @@
RelativePath="..\..\..\src\validator\Validator.h">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h">
</File>
<File
Modified: trunk/libsbml/win/msvc7/libxml2/libsbml_java.vcproj
===================================================================
--- trunk/libsbml/win/msvc7/libxml2/libsbml_java.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc7/libxml2/libsbml_java.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -612,6 +612,9 @@
RelativePath="..\..\..\src\validator\Validator.cpp">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp">
</File>
<File
@@ -1102,6 +1105,9 @@
RelativePath="..\..\..\src\validator\Validator.h">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h">
</File>
<File
Modified: trunk/libsbml/win/msvc7/libxml2/libsbml_python.vcproj
===================================================================
--- trunk/libsbml/win/msvc7/libxml2/libsbml_python.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc7/libxml2/libsbml_python.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -614,6 +614,9 @@
RelativePath="..\..\..\src\validator\Validator.cpp">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp">
</File>
<File
@@ -1104,6 +1107,9 @@
RelativePath="..\..\..\src\validator\Validator.h">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h">
</File>
<File
Modified: trunk/libsbml/win/msvc7/xerces/libsbml_csharp.vcproj
===================================================================
--- trunk/libsbml/win/msvc7/xerces/libsbml_csharp.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc7/xerces/libsbml_csharp.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -597,6 +597,9 @@
RelativePath="..\..\..\src\validator\Validator.cpp">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp">
</File>
<File
@@ -1087,6 +1090,9 @@
RelativePath="..\..\..\src\validator\Validator.h">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h">
</File>
<File
Modified: trunk/libsbml/win/msvc7/xerces/libsbml_java.vcproj
===================================================================
--- trunk/libsbml/win/msvc7/xerces/libsbml_java.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc7/xerces/libsbml_java.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -597,6 +597,9 @@
RelativePath="..\..\..\src\validator\Validator.cpp">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp">
</File>
<File
@@ -1087,6 +1090,9 @@
RelativePath="..\..\..\src\validator\Validator.h">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h">
</File>
<File
Modified: trunk/libsbml/win/msvc7/xerces/libsbml_python.vcproj
===================================================================
--- trunk/libsbml/win/msvc7/xerces/libsbml_python.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc7/xerces/libsbml_python.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -599,6 +599,9 @@
RelativePath="..\..\..\src\validator\Validator.cpp">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp">
</File>
<File
@@ -1089,6 +1092,9 @@
RelativePath="..\..\..\src\validator\Validator.h">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h">
</File>
<File
Modified: trunk/libsbml/win/msvc8/expat/libsbml.vcproj
===================================================================
--- trunk/libsbml/win/msvc8/expat/libsbml.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc8/expat/libsbml.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -814,6 +814,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1458,6 +1462,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: trunk/libsbml/win/msvc8/expat/libsbml_csharp.vcproj
===================================================================
--- trunk/libsbml/win/msvc8/expat/libsbml_csharp.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc8/expat/libsbml_csharp.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -818,6 +818,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1462,6 +1466,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: trunk/libsbml/win/msvc8/expat/libsbml_java.vcproj
===================================================================
--- trunk/libsbml/win/msvc8/expat/libsbml_java.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc8/expat/libsbml_java.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -818,6 +818,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1462,6 +1466,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: trunk/libsbml/win/msvc8/expat/libsbml_python.vcproj
===================================================================
--- trunk/libsbml/win/msvc8/expat/libsbml_python.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc8/expat/libsbml_python.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -820,6 +820,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1464,6 +1468,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: trunk/libsbml/win/msvc8/libxml2/libsbml.vcproj
===================================================================
--- trunk/libsbml/win/msvc8/libxml2/libsbml.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc8/libxml2/libsbml.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -822,6 +822,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1474,6 +1478,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: trunk/libsbml/win/msvc8/libxml2/libsbml_csharp.vcproj
===================================================================
--- trunk/libsbml/win/msvc8/libxml2/libsbml_csharp.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc8/libxml2/libsbml_csharp.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -826,6 +826,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1478,6 +1482,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: trunk/libsbml/win/msvc8/libxml2/libsbml_java.vcproj
===================================================================
--- trunk/libsbml/win/msvc8/libxml2/libsbml_java.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc8/libxml2/libsbml_java.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -826,6 +826,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1478,6 +1482,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: trunk/libsbml/win/msvc8/libxml2/libsbml_python.vcproj
===================================================================
--- trunk/libsbml/win/msvc8/libxml2/libsbml_python.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc8/libxml2/libsbml_python.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -828,6 +828,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1480,6 +1484,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: trunk/libsbml/win/msvc8/xerces/libsbml.vcproj
===================================================================
--- trunk/libsbml/win/msvc8/xerces/libsbml.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc8/xerces/libsbml.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -802,6 +802,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1454,6 +1458,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: trunk/libsbml/win/msvc8/xerces/libsbml_csharp.vcproj
===================================================================
--- trunk/libsbml/win/msvc8/xerces/libsbml_csharp.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc8/xerces/libsbml_csharp.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -798,6 +798,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1446,6 +1450,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: trunk/libsbml/win/msvc8/xerces/libsbml_java.vcproj
===================================================================
--- trunk/libsbml/win/msvc8/xerces/libsbml_java.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc8/xerces/libsbml_java.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -798,6 +798,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1446,6 +1450,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: trunk/libsbml/win/msvc8/xerces/libsbml_python.vcproj
===================================================================
--- trunk/libsbml/win/msvc8/xerces/libsbml_python.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc8/xerces/libsbml_python.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -800,6 +800,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1448,6 +1452,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: trunk/libsbml/win/msvc9/expat/libsbml.vcproj
===================================================================
--- trunk/libsbml/win/msvc9/expat/libsbml.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc9/expat/libsbml.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -813,6 +813,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1457,6 +1461,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: trunk/libsbml/win/msvc9/expat/libsbml_csharp.vcproj
===================================================================
--- trunk/libsbml/win/msvc9/expat/libsbml_csharp.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc9/expat/libsbml_csharp.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -817,6 +817,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1461,6 +1465,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: trunk/libsbml/win/msvc9/expat/libsbml_java.vcproj
===================================================================
--- trunk/libsbml/win/msvc9/expat/libsbml_java.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc9/expat/libsbml_java.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -817,6 +817,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1461,6 +1465,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: trunk/libsbml/win/msvc9/expat/libsbml_python.vcproj
===================================================================
--- trunk/libsbml/win/msvc9/expat/libsbml_python.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc9/expat/libsbml_python.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -819,6 +819,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1463,6 +1467,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: trunk/libsbml/win/msvc9/libxml2/libsbml.vcproj
===================================================================
--- trunk/libsbml/win/msvc9/libxml2/libsbml.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc9/libxml2/libsbml.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -821,6 +821,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1473,6 +1477,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: trunk/libsbml/win/msvc9/libxml2/libsbml_csharp.vcproj
===================================================================
--- trunk/libsbml/win/msvc9/libxml2/libsbml_csharp.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc9/libxml2/libsbml_csharp.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -825,6 +825,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1477,6 +1481,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: trunk/libsbml/win/msvc9/libxml2/libsbml_java.vcproj
===================================================================
--- trunk/libsbml/win/msvc9/libxml2/libsbml_java.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc9/libxml2/libsbml_java.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -825,6 +825,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1477,6 +1481,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: trunk/libsbml/win/msvc9/libxml2/libsbml_python.vcproj
===================================================================
--- trunk/libsbml/win/msvc9/libxml2/libsbml_python.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc9/libxml2/libsbml_python.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -827,6 +827,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1479,6 +1483,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: trunk/libsbml/win/msvc9/xerces/libsbml.vcproj
===================================================================
--- trunk/libsbml/win/msvc9/xerces/libsbml.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc9/xerces/libsbml.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -801,6 +801,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1453,6 +1457,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: trunk/libsbml/win/msvc9/xerces/libsbml_csharp.vcproj
===================================================================
--- trunk/libsbml/win/msvc9/xerces/libsbml_csharp.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc9/xerces/libsbml_csharp.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -805,6 +805,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1457,6 +1461,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: trunk/libsbml/win/msvc9/xerces/libsbml_java.vcproj
===================================================================
--- trunk/libsbml/win/msvc9/xerces/libsbml_java.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc9/xerces/libsbml_java.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -805,6 +805,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1457,6 +1461,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: trunk/libsbml/win/msvc9/xerces/libsbml_python.vcproj
===================================================================
--- trunk/libsbml/win/msvc9/xerces/libsbml_python.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
+++ trunk/libsbml/win/msvc9/xerces/libsbml_python.vcproj 2010-04-29 14:08:18 UTC (rev 11232)
@@ -807,6 +807,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1459,6 +1463,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sar...@us...> - 2010-04-29 13:43:32
|
Revision: 11231
http://sbml.svn.sourceforge.net/sbml/?rev=11231&view=rev
Author: sarahkeating
Date: 2010-04-29 13:43:25 +0000 (Thu, 29 Apr 2010)
Log Message:
-----------
updated project files
Modified Paths:
--------------
branches/libsbml-5/win/msvc7/expat/libsbml.vcproj
branches/libsbml-5/win/msvc7/expat/libsbml_csharp.vcproj
branches/libsbml-5/win/msvc7/expat/libsbml_java.vcproj
branches/libsbml-5/win/msvc7/expat/libsbml_python.vcproj
branches/libsbml-5/win/msvc7/libxml2/libsbml.vcproj
branches/libsbml-5/win/msvc7/libxml2/libsbml_csharp.vcproj
branches/libsbml-5/win/msvc7/libxml2/libsbml_java.vcproj
branches/libsbml-5/win/msvc7/libxml2/libsbml_python.vcproj
branches/libsbml-5/win/msvc7/xerces/libsbml.vcproj
branches/libsbml-5/win/msvc7/xerces/libsbml_csharp.vcproj
branches/libsbml-5/win/msvc7/xerces/libsbml_java.vcproj
branches/libsbml-5/win/msvc7/xerces/libsbml_python.vcproj
branches/libsbml-5/win/msvc8/expat/libsbml.vcproj
branches/libsbml-5/win/msvc8/expat/libsbml_csharp.vcproj
branches/libsbml-5/win/msvc8/expat/libsbml_java.vcproj
branches/libsbml-5/win/msvc8/expat/libsbml_python.vcproj
branches/libsbml-5/win/msvc8/libxml2/libsbml.vcproj
branches/libsbml-5/win/msvc8/libxml2/libsbml_csharp.vcproj
branches/libsbml-5/win/msvc8/libxml2/libsbml_java.vcproj
branches/libsbml-5/win/msvc8/libxml2/libsbml_python.vcproj
branches/libsbml-5/win/msvc8/xerces/libsbml.vcproj
branches/libsbml-5/win/msvc8/xerces/libsbml_csharp.vcproj
branches/libsbml-5/win/msvc8/xerces/libsbml_java.vcproj
branches/libsbml-5/win/msvc8/xerces/libsbml_python.vcproj
branches/libsbml-5/win/msvc9/expat/libsbml.vcproj
branches/libsbml-5/win/msvc9/expat/libsbml_csharp.vcproj
branches/libsbml-5/win/msvc9/expat/libsbml_java.vcproj
branches/libsbml-5/win/msvc9/expat/libsbml_python.vcproj
branches/libsbml-5/win/msvc9/libxml2/libsbml.vcproj
branches/libsbml-5/win/msvc9/libxml2/libsbml_csharp.vcproj
branches/libsbml-5/win/msvc9/libxml2/libsbml_java.vcproj
branches/libsbml-5/win/msvc9/libxml2/libsbml_python.vcproj
branches/libsbml-5/win/msvc9/xerces/libsbml.vcproj
branches/libsbml-5/win/msvc9/xerces/libsbml_csharp.vcproj
branches/libsbml-5/win/msvc9/xerces/libsbml_java.vcproj
branches/libsbml-5/win/msvc9/xerces/libsbml_python.vcproj
Modified: branches/libsbml-5/win/msvc7/expat/libsbml.vcproj
===================================================================
--- branches/libsbml-5/win/msvc7/expat/libsbml.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc7/expat/libsbml.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -549,6 +549,9 @@
RelativePath="..\..\..\src\validator\Validator.cpp">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp">
</File>
<File
@@ -1072,6 +1075,9 @@
RelativePath="..\..\..\src\validator\Validator.h">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h">
</File>
<File
Modified: branches/libsbml-5/win/msvc7/expat/libsbml_csharp.vcproj
===================================================================
--- branches/libsbml-5/win/msvc7/expat/libsbml_csharp.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc7/expat/libsbml_csharp.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -552,6 +552,9 @@
RelativePath="..\..\..\src\validator\Validator.cpp">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp">
</File>
<File
@@ -1075,6 +1078,9 @@
RelativePath="..\..\..\src\validator\Validator.h">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h">
</File>
<File
Modified: branches/libsbml-5/win/msvc7/expat/libsbml_java.vcproj
===================================================================
--- branches/libsbml-5/win/msvc7/expat/libsbml_java.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc7/expat/libsbml_java.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -552,6 +552,9 @@
RelativePath="..\..\..\src\validator\Validator.cpp">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp">
</File>
<File
@@ -1075,6 +1078,9 @@
RelativePath="..\..\..\src\validator\Validator.h">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h">
</File>
<File
Modified: branches/libsbml-5/win/msvc7/expat/libsbml_python.vcproj
===================================================================
--- branches/libsbml-5/win/msvc7/expat/libsbml_python.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc7/expat/libsbml_python.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -554,6 +554,9 @@
RelativePath="..\..\..\src\validator\Validator.cpp">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp">
</File>
<File
@@ -1077,6 +1080,9 @@
RelativePath="..\..\..\src\validator\Validator.h">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h">
</File>
<File
Modified: branches/libsbml-5/win/msvc7/libxml2/libsbml.vcproj
===================================================================
--- branches/libsbml-5/win/msvc7/libxml2/libsbml.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc7/libxml2/libsbml.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -555,6 +555,9 @@
RelativePath="..\..\..\src\validator\Validator.cpp">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp">
</File>
<File
@@ -1084,6 +1087,9 @@
RelativePath="..\..\..\src\validator\Validator.h">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h">
</File>
<File
Modified: branches/libsbml-5/win/msvc7/libxml2/libsbml_csharp.vcproj
===================================================================
--- branches/libsbml-5/win/msvc7/libxml2/libsbml_csharp.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc7/libxml2/libsbml_csharp.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -558,6 +558,9 @@
RelativePath="..\..\..\src\validator\Validator.cpp">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp">
</File>
<File
@@ -1087,6 +1090,9 @@
RelativePath="..\..\..\src\validator\Validator.h">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h">
</File>
<File
Modified: branches/libsbml-5/win/msvc7/libxml2/libsbml_java.vcproj
===================================================================
--- branches/libsbml-5/win/msvc7/libxml2/libsbml_java.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc7/libxml2/libsbml_java.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -558,6 +558,9 @@
RelativePath="..\..\..\src\validator\Validator.cpp">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp">
</File>
<File
@@ -1087,6 +1090,9 @@
RelativePath="..\..\..\src\validator\Validator.h">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h">
</File>
<File
Modified: branches/libsbml-5/win/msvc7/libxml2/libsbml_python.vcproj
===================================================================
--- branches/libsbml-5/win/msvc7/libxml2/libsbml_python.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc7/libxml2/libsbml_python.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -560,6 +560,9 @@
RelativePath="..\..\..\src\validator\Validator.cpp">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp">
</File>
<File
@@ -1089,6 +1092,9 @@
RelativePath="..\..\..\src\validator\Validator.h">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h">
</File>
<File
Modified: branches/libsbml-5/win/msvc7/xerces/libsbml.vcproj
===================================================================
--- branches/libsbml-5/win/msvc7/xerces/libsbml.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc7/xerces/libsbml.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -540,6 +540,9 @@
RelativePath="..\..\..\src\validator\Validator.cpp">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp">
</File>
<File
@@ -1069,6 +1072,9 @@
RelativePath="..\..\..\src\validator\Validator.h">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h">
</File>
<File
Modified: branches/libsbml-5/win/msvc7/xerces/libsbml_csharp.vcproj
===================================================================
--- branches/libsbml-5/win/msvc7/xerces/libsbml_csharp.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc7/xerces/libsbml_csharp.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -543,6 +543,9 @@
RelativePath="..\..\..\src\validator\Validator.cpp">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp">
</File>
<File
@@ -1072,6 +1075,9 @@
RelativePath="..\..\..\src\validator\Validator.h">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h">
</File>
<File
Modified: branches/libsbml-5/win/msvc7/xerces/libsbml_java.vcproj
===================================================================
--- branches/libsbml-5/win/msvc7/xerces/libsbml_java.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc7/xerces/libsbml_java.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -543,6 +543,9 @@
RelativePath="..\..\..\src\validator\Validator.cpp">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp">
</File>
<File
@@ -1072,6 +1075,9 @@
RelativePath="..\..\..\src\validator\Validator.h">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h">
</File>
<File
Modified: branches/libsbml-5/win/msvc7/xerces/libsbml_python.vcproj
===================================================================
--- branches/libsbml-5/win/msvc7/xerces/libsbml_python.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc7/xerces/libsbml_python.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -545,6 +545,9 @@
RelativePath="..\..\..\src\validator\Validator.cpp">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp">
</File>
<File
@@ -1074,6 +1077,9 @@
RelativePath="..\..\..\src\validator\Validator.h">
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h">
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h">
</File>
<File
Modified: branches/libsbml-5/win/msvc8/expat/libsbml.vcproj
===================================================================
--- branches/libsbml-5/win/msvc8/expat/libsbml.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc8/expat/libsbml.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -742,6 +742,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1406,6 +1410,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: branches/libsbml-5/win/msvc8/expat/libsbml_csharp.vcproj
===================================================================
--- branches/libsbml-5/win/msvc8/expat/libsbml_csharp.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc8/expat/libsbml_csharp.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -746,6 +746,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1410,6 +1414,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: branches/libsbml-5/win/msvc8/expat/libsbml_java.vcproj
===================================================================
--- branches/libsbml-5/win/msvc8/expat/libsbml_java.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc8/expat/libsbml_java.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -746,6 +746,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1410,6 +1414,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: branches/libsbml-5/win/msvc8/expat/libsbml_python.vcproj
===================================================================
--- branches/libsbml-5/win/msvc8/expat/libsbml_python.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc8/expat/libsbml_python.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -748,6 +748,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1412,6 +1416,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: branches/libsbml-5/win/msvc8/libxml2/libsbml.vcproj
===================================================================
--- branches/libsbml-5/win/msvc8/libxml2/libsbml.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc8/libxml2/libsbml.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -750,6 +750,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1422,6 +1426,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: branches/libsbml-5/win/msvc8/libxml2/libsbml_csharp.vcproj
===================================================================
--- branches/libsbml-5/win/msvc8/libxml2/libsbml_csharp.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc8/libxml2/libsbml_csharp.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -754,6 +754,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1426,6 +1430,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: branches/libsbml-5/win/msvc8/libxml2/libsbml_java.vcproj
===================================================================
--- branches/libsbml-5/win/msvc8/libxml2/libsbml_java.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc8/libxml2/libsbml_java.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -754,6 +754,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1426,6 +1430,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: branches/libsbml-5/win/msvc8/libxml2/libsbml_python.vcproj
===================================================================
--- branches/libsbml-5/win/msvc8/libxml2/libsbml_python.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc8/libxml2/libsbml_python.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -756,6 +756,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1428,6 +1432,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: branches/libsbml-5/win/msvc8/xerces/libsbml.vcproj
===================================================================
--- branches/libsbml-5/win/msvc8/xerces/libsbml.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc8/xerces/libsbml.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -730,6 +730,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1402,6 +1406,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: branches/libsbml-5/win/msvc8/xerces/libsbml_csharp.vcproj
===================================================================
--- branches/libsbml-5/win/msvc8/xerces/libsbml_csharp.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc8/xerces/libsbml_csharp.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -734,6 +734,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1406,6 +1410,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: branches/libsbml-5/win/msvc8/xerces/libsbml_java.vcproj
===================================================================
--- branches/libsbml-5/win/msvc8/xerces/libsbml_java.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc8/xerces/libsbml_java.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -734,6 +734,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1406,6 +1410,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: branches/libsbml-5/win/msvc8/xerces/libsbml_python.vcproj
===================================================================
--- branches/libsbml-5/win/msvc8/xerces/libsbml_python.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc8/xerces/libsbml_python.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -736,6 +736,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1408,6 +1412,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: branches/libsbml-5/win/msvc9/expat/libsbml.vcproj
===================================================================
--- branches/libsbml-5/win/msvc9/expat/libsbml.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc9/expat/libsbml.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -741,6 +741,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1405,6 +1409,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: branches/libsbml-5/win/msvc9/expat/libsbml_csharp.vcproj
===================================================================
--- branches/libsbml-5/win/msvc9/expat/libsbml_csharp.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc9/expat/libsbml_csharp.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -745,6 +745,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1409,6 +1413,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: branches/libsbml-5/win/msvc9/expat/libsbml_java.vcproj
===================================================================
--- branches/libsbml-5/win/msvc9/expat/libsbml_java.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc9/expat/libsbml_java.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -745,6 +745,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1409,6 +1413,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: branches/libsbml-5/win/msvc9/expat/libsbml_python.vcproj
===================================================================
--- branches/libsbml-5/win/msvc9/expat/libsbml_python.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc9/expat/libsbml_python.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -747,6 +747,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1411,6 +1415,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: branches/libsbml-5/win/msvc9/libxml2/libsbml.vcproj
===================================================================
--- branches/libsbml-5/win/msvc9/libxml2/libsbml.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc9/libxml2/libsbml.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -749,6 +749,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1421,6 +1425,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: branches/libsbml-5/win/msvc9/libxml2/libsbml_csharp.vcproj
===================================================================
--- branches/libsbml-5/win/msvc9/libxml2/libsbml_csharp.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc9/libxml2/libsbml_csharp.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -753,6 +753,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1425,6 +1429,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: branches/libsbml-5/win/msvc9/libxml2/libsbml_java.vcproj
===================================================================
--- branches/libsbml-5/win/msvc9/libxml2/libsbml_java.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc9/libxml2/libsbml_java.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -753,6 +753,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1425,6 +1429,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: branches/libsbml-5/win/msvc9/libxml2/libsbml_python.vcproj
===================================================================
--- branches/libsbml-5/win/msvc9/libxml2/libsbml_python.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc9/libxml2/libsbml_python.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -755,6 +755,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1427,6 +1431,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: branches/libsbml-5/win/msvc9/xerces/libsbml.vcproj
===================================================================
--- branches/libsbml-5/win/msvc9/xerces/libsbml.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc9/xerces/libsbml.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -729,6 +729,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1401,6 +1405,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: branches/libsbml-5/win/msvc9/xerces/libsbml_csharp.vcproj
===================================================================
--- branches/libsbml-5/win/msvc9/xerces/libsbml_csharp.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc9/xerces/libsbml_csharp.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -733,6 +733,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1405,6 +1409,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: branches/libsbml-5/win/msvc9/xerces/libsbml_java.vcproj
===================================================================
--- branches/libsbml-5/win/msvc9/xerces/libsbml_java.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc9/xerces/libsbml_java.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -733,6 +733,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1405,6 +1409,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
Modified: branches/libsbml-5/win/msvc9/xerces/libsbml_python.vcproj
===================================================================
--- branches/libsbml-5/win/msvc9/xerces/libsbml_python.vcproj 2010-04-29 12:11:17 UTC (rev 11230)
+++ branches/libsbml-5/win/msvc9/xerces/libsbml_python.vcproj 2010-04-29 13:43:25 UTC (rev 11231)
@@ -735,6 +735,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.cpp"
>
</File>
@@ -1407,6 +1411,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\validator\constraints\ValidCnUnitsValue.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\validator\VConstraint.h"
>
</File>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sar...@us...> - 2010-04-29 12:11:28
|
Revision: 11230
http://sbml.svn.sourceforge.net/sbml/?rev=11230&view=rev
Author: sarahkeating
Date: 2010-04-29 12:11:17 +0000 (Thu, 29 Apr 2010)
Log Message:
-----------
chck_swig_version.sh.in needs to be in dist
Modified Paths:
--------------
branches/libsbml-5/Makefile.in
Modified: branches/libsbml-5/Makefile.in
===================================================================
--- branches/libsbml-5/Makefile.in 2010-04-29 11:16:35 UTC (rev 11229)
+++ branches/libsbml-5/Makefile.in 2010-04-29 12:11:17 UTC (rev 11230)
@@ -201,6 +201,7 @@
VERSION.txt \
aclocal.m4 \
acinclude.m4 \
+ config/chk_swig_version.sh.in \
config/config.guess \
config/config.sub \
config/doxygen.m4 \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sar...@us...> - 2010-04-29 11:16:41
|
Revision: 11229
http://sbml.svn.sourceforge.net/sbml/?rev=11229&view=rev
Author: sarahkeating
Date: 2010-04-29 11:16:35 +0000 (Thu, 29 Apr 2010)
Log Message:
-----------
chck_swig_version.sh.in needs to be in dist
Modified Paths:
--------------
trunk/libsbml/Makefile.in
Modified: trunk/libsbml/Makefile.in
===================================================================
--- trunk/libsbml/Makefile.in 2010-04-29 11:15:38 UTC (rev 11228)
+++ trunk/libsbml/Makefile.in 2010-04-29 11:16:35 UTC (rev 11229)
@@ -195,6 +195,7 @@
VERSION.txt \
aclocal.m4 \
acinclude.m4 \
+ config/chk_swig_version.sh.in \
config/config.guess \
config/config.sub \
config/doxygen.m4 \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sar...@us...> - 2010-04-29 11:15:45
|
Revision: 11228
http://sbml.svn.sourceforge.net/sbml/?rev=11228&view=rev
Author: sarahkeating
Date: 2010-04-29 11:15:38 +0000 (Thu, 29 Apr 2010)
Log Message:
-----------
merged changes to build
Modified Paths:
--------------
branches/libsbml-5/Makefile.in
branches/libsbml-5/config/.svnignore
branches/libsbml-5/config/makefile-common-actions.mk
branches/libsbml-5/config/makefile-common-vars.mk.in
branches/libsbml-5/config/matlab.m4
branches/libsbml-5/config/swig.m4
branches/libsbml-5/config/univbinary.m4
branches/libsbml-5/configure.ac
Added Paths:
-----------
branches/libsbml-5/config/chk_swig_version.sh.in
Modified: branches/libsbml-5/Makefile.in
===================================================================
--- branches/libsbml-5/Makefile.in 2010-04-29 00:52:52 UTC (rev 11227)
+++ branches/libsbml-5/Makefile.in 2010-04-29 11:15:38 UTC (rev 11228)
@@ -241,7 +241,8 @@
extra_distclean = config.status config.cache config.log autom4te.cache \
src/common/config.h src/common/stamp-h1 config/lt_link_helper.sh \
- config/mkoctfile_wrapper.sh libtool doltlibtool doltcompile
+ config/mkoctfile_wrapper.sh libtool doltlibtool doltcompile \
+ config/makefile-common-vars.mk config/chk_swig_version.sh
# It's safer to remove and recreate the copy of the include files (in the
# 'include' directory) after a make clean. Previously we did it in a make
Modified: branches/libsbml-5/config/.svnignore
===================================================================
--- branches/libsbml-5/config/.svnignore 2010-04-29 00:52:52 UTC (rev 11227)
+++ branches/libsbml-5/config/.svnignore 2010-04-29 11:15:38 UTC (rev 11228)
@@ -11,3 +11,4 @@
makefile-common-vars.mk
mkoctfile_wrapper.sh
lt_link_helper.sh
+chk_swig_version.sh
Added: branches/libsbml-5/config/chk_swig_version.sh.in
===================================================================
--- branches/libsbml-5/config/chk_swig_version.sh.in (rev 0)
+++ branches/libsbml-5/config/chk_swig_version.sh.in 2010-04-29 11:15:38 UTC (rev 11228)
@@ -0,0 +1,48 @@
+#!/bin/sh
+# $Id: chk_swig_version.sh.in 11210 2010-04-27 04:21:38Z mhucka $ -*- Mode: csh -*-
+# $URL: https://sbml.svn.sourceforge.net/svnroot/sbml/trunk/libsbml/config/chk_swig_version.sh.in $
+# -----------------------------------------------------------------------------
+# Description: Test the version of SWIG we were configured with
+# First Author: Michael Hucka <mh...@ca...>
+# Organization: California Institute of Technology
+# -----------------------------------------------------------------------------
+
+SWIG="@SWIG@"
+NEED="@SWIGNEEDVERSION@"
+
+if ! ($SWIG -version > /dev/null 2>&1); then
+ echo
+ echo One or more of the dependencies required to compile a file in the
+ echo libSBML language bindings has changed, but libSBML cannot find the
+ echo program \'swig\' and thus cannot proceed. Please re-run the libSBML
+ echo \'configure\' program using the --with-swig option to indicate where
+ echo the configure program can find \'swig\' version $NEED or later.
+ echo
+ exit 1;
+fi
+
+rx=`echo $NEED | sed -e 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'`
+ry=`echo $NEED | sed -e 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'`
+rz=`echo $NEED | sed -e 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'`
+
+version=`"$SWIG" -version 2>&1`
+
+sx=`echo $version | sed -e 's/SWIG Version \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'`
+sy=`echo $version | sed -e 's/SWIG Version \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'`
+sz=`echo $version | sed -e 's/SWIG Version \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'`
+
+if test $sx -gt $rx \
+ || (test $sx -eq $rx && test $sy -gt $ry) \
+ || (test $sx -eq $rx && test $sy -eq $ry && test $sz -ge $rz); then
+ exit 0;
+else
+ echo
+ echo One or more of the dependencies required to compile a file in the
+ echo libSBML language bindings has changed, but the version of \'swig\'
+ echo found \($sx.$sy.$sz\) by the libSBML build system is too old. Please
+ echo re-run the libSBML \'configure\' program using the --with-swig
+ echo option to indicate where the configure program can find \'swig\'
+ echo version $NEED or later.
+ echo
+ exit 1;
+fi
Modified: branches/libsbml-5/config/makefile-common-actions.mk
===================================================================
--- branches/libsbml-5/config/makefile-common-actions.mk 2010-04-29 00:52:52 UTC (rev 11227)
+++ branches/libsbml-5/config/makefile-common-actions.mk 2010-04-29 11:15:38 UTC (rev 11228)
@@ -12,7 +12,7 @@
## This file is part of libSBML. Please visit http://sbml.org for more
## information about SBML, and the latest version of libSBML.
##
-## Copyright 2005-2009 California Institute of Technology.
+## Copyright 2005-2010 California Institute of Technology.
## Copyright 2002-2005 California Institute of Technology and
## Japan Science and Technology Corporation.
##
@@ -382,11 +382,39 @@
# This depends on $(check_driver) and $(test_objfiles) to have been defined
# in the including Makefile.
+# 2010-04-26: if you build libSBML as a universal binary with x86_64 support
+# on MacOS 10.5, "make check" may fail because not all the libraries needed
+# by an executable are available in 64-bit form on the system. We have to
+# drop down to 32-bit in that case. Conversely, on 10.6, MacOS ships with
+# 64-bit binaries for (it seems) everything, and builds 64-bit executables
+# by default.
+
+filtered_cflags = $(shell echo '$(CFLAGS)' | sed -e "s/-arch x86_64//g")
+filtered_cppflags = $(shell echo '$(CPPFLAGS)' | sed -e "s/-arch x86_64//g")
+filtered_ldflags = $(shell echo '$(LDFLAGS)' | sed -e "s/-arch x86_64//g")
+
$(check_driver): $(test_objfiles)
- $(LIBTOOL) --mode=link $(CXX) $(extra_CPPFLAGS) $(extra_CXXFLAGS) $(default_includes) \
- $(CPPFLAGS) $(CFLAGS) $(INCLUDES) \
+ifndef USE_UNIVBINARY
+ $(LIBTOOL) --mode=link $(CXX) $(extra_CPPFLAGS) $(extra_CXXFLAGS) \
+ $(default_includes) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) \
$(test_objfiles) $(objfiles) $(extra_LDFLAGS) $(LDFLAGS) \
$(LIBS) $(extra_LIBS) -o $@
+else
+ @version=`uname -r | awk -F. '{print $$1}'`;\
+ if test $$version -ge 10; then \
+ cflags="$(CFLAGS)"; \
+ cppflags="$(CPPFLAGS)"; \
+ ldflags="$(LDFLAGS)"; \
+ else \
+ cflags="$(filtered_cflags)";\
+ cppflags="$(filtered_cppflags)";\
+ ldflags="$(filtered_ldflags)";\
+ fi; \
+ $(LIBTOOL) --mode=link $(CXX) $(extra_CPPFLAGS) $(extra_CXXFLAGS) \
+ $(default_includes) $$cppflags $$cflags $(INCLUDES) \
+ $(test_objfiles) $(objfiles) $(extra_LDFLAGS) $$ldflags \
+ $(LIBS) $(extra_LIBS) -o $@
+endif
run-checks: $(check_driver) $(libraries)
@echo
Modified: branches/libsbml-5/config/makefile-common-vars.mk.in
===================================================================
--- branches/libsbml-5/config/makefile-common-vars.mk.in 2010-04-29 00:52:52 UTC (rev 11227)
+++ branches/libsbml-5/config/makefile-common-vars.mk.in 2010-04-29 11:15:38 UTC (rev 11228)
@@ -170,6 +170,7 @@
SWIG = @SWIG@
SWIGLIB = @SWIGLIB@
SWIGFLAGS = @SWIGFLAGS@
+SWIGNEEDVERSION = @SWIGNEEDVERSION@
ACLOCAL = @ACLOCAL@
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -217,6 +218,11 @@
HOST_OS = @host_os@
HOST_TYPE = @HOST_TYPE@
HOST_CPU = @host_cpu@
+ifeq "$(HOST_TYPE)" "darwin"
+ MACOS_VERSION = $(shell sw_vers -productVersion | cut -d"." -f1,2)
+else
+ MACOS_VERSION =
+endif
INSTALL = @INSTALL@
INSTALL_SH = $(top_srcdir)/config/install-sh -c
LDFLAGS = @LDFLAGS@ @ZLIB_LDFLAGS@ @BZ2_LDFLAGS@
Modified: branches/libsbml-5/config/matlab.m4
===================================================================
--- branches/libsbml-5/config/matlab.m4 2010-04-29 00:52:52 UTC (rev 11227)
+++ branches/libsbml-5/config/matlab.m4 2010-04-29 11:15:38 UTC (rev 11228)
@@ -49,36 +49,56 @@
AC_MSG_ERROR([Could not find 'mex' executable for MATLAB.])
fi
- dnl The mex extension really should be obtained using matlab's
- dnl "mexext", but it lives in the matlab directory and there's no way
- dnl to know a priori where that is. After all, users may only have
- dnl provided --with-matlab during configuration, without telling us the
- dnl matlab installation directory.
+ dnl
+ dnl Obtain the matlab's install path
+ dnl
+ MATLAB_PREFIX=`$MATLAB -e | grep '^MATLAB' | awk -F'=' '{print $2}'`
- case $host in
- *86-*-darwin*)
- MEXEXT="mexmaci"
- ;;
+ dnl
+ dnl Obtain the mex extension by mexext command.
+ dnl
+ MATLAB_MEXEXT="${MATLAB_PREFIX}/bin/mexext"
+ MEXEXT=`${MATLAB_MEXEXT}`
- *powerpc-*-darwin*)
- MEXEXT="mexmac"
- ;;
+ dnl Checks if the matlab (32bit) is used on Snow Leopard.
+ dnl Since, by default, gcc generates a 64bit (x86_64) only binary on
+ dnl Snow Leopard, a 32bit (i386) binary needs to be explicitly built by
+ dnl gcc with "-arch i386" option if matlab (32bit) is used.
+ dnl Thus, an error message is printed if "-arch i386" option is not
+ dnl enabled with the combination of the matlab (32bit) and Snow Leopard.
- *cygwin*)
- MEXEXT="dll"
- ;;
+ OSX_SNOW_LEOPARD="no"
+ OSX_MAJOR_VER=`uname -r | awk -F. '{print $1}'`
+ if expr ${OSX_MAJOR_VER} \>= 10 | grep -q 1; then
+ OSX_SNOW_LEOPARD="yes"
+ fi
- *x86_64*)
- MEXEXT="mexa64"
- ;;
+ if test ${OSX_SNOW_LEOPARD} = "yes" -a ${MEXEXT} = "mexmaci"; then
+ AC_MSG_CHECKING(whether -arch i386 option is enabled for Matlab 32bit on Snow Leopard.)
+ OSX_ARCH_I386="no"
+ if echo $CXXFLAGS | grep -q "-arch i386"; then
+ OSX_ARCH_I386="yes"
+ elif echo $CPPFLAGS | grep -q "-arch i386"; then
+ OSX_ARCH_I386="yes"
+ fi
- dnl Default is x86.
- *)
- MEXEXT="mexglx"
- ;;
+ if test ${OSX_ARCH_I386} = "no"; then
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([libSBML needs to be built explicitly to include a 32-bit (i386) version,
+ because your copy of MATLAB is a 32-bit version. By default, MacOS 10.6+
+ (Snow Leopard) builds everything as 64-bit (x86_64) binaries. Please add
+ --enable-universal-binary="-arch i386 -arch x86_64"
+ to your configure options, re-run the configure step, and recompile. If
+ you get a compilation error, please check whether you have a private
+ version of a dependent library (e.g., expat, libxml, or xerces) that was
+ built only as a 32-bit version, and either remove or recompile it before
+ proceeding future.])
+ else
+ AC_MSG_RESULT(yes)
+ fi
+
+ fi
- esac
-
AC_DEFINE([USE_MATLAB], 1, [Define to 1 to use Matlab])
AC_SUBST(USE_MATLAB, 1)
Modified: branches/libsbml-5/config/swig.m4
===================================================================
--- branches/libsbml-5/config/swig.m4 2010-04-29 00:52:52 UTC (rev 11227)
+++ branches/libsbml-5/config/swig.m4 2010-04-29 11:15:38 UTC (rev 11228)
@@ -31,7 +31,7 @@
AC_ARG_WITH([swig],
AC_HELP_STRING([--with-swig=PREFIX],
- [Regenerate SWIG wrappers [[default=no]]]),
+ [Regenerate SWIG wrappers [[default=if_needed]]]),
[with_swig=$withval],
[with_swig=no])
@@ -53,58 +53,35 @@
AC_PATH_PROG([SWIG], [swig])
fi
- dnl Sanity checks.
+ dnl Set up replacement variables, including some that we don't currently
+ dnl use but may in the future.
- if test -z "$SWIG" -o "$SWIG" = "no"; then
- AC_MSG_ERROR([Could not find `swig' executable.])
- fi
-
- dnl Check the version if required.
-
- m4_ifvaln([$1], [
- AC_MSG_CHECKING($SWIG version >= $1)
-
- changequote(<<, >>)
-
- rx=`echo $1 | sed -e 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'`
- ry=`echo $1 | sed -e 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'`
- rz=`echo $1 | sed -e 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'`
-
- version=`"$SWIG" -version | tr -d '\015'`
-
- sx=`echo $version | sed -e 's/SWIG Version \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'`
- sy=`echo $version | sed -e 's/SWIG Version \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'`
- sz=`echo $version | sed -e 's/SWIG Version \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'`
-
- changequote([, ])
-
- if test $sx -gt $rx \
- || (test $sx -eq $rx && test $sy -gt $ry) \
- || (test $sx -eq $rx && test $sy -eq $ry && test $sz -ge $rz); then
- AC_MSG_RESULT(yes (found $sx.$sy.$sz))
-
- dnl Now ask swig for the list of libraries that it wants.
-
- SWIGLIB=`"$SWIG" -swiglib`
- else
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([Need SWIG version $1, but only found version $sx.$sy.$sz.])
- fi
-
- ])
-
AC_DEFINE([USE_SWIG], 1, [Define to 1 to use SWIG])
AC_SUBST(USE_SWIG, 1)
- AC_SUBST(SWIG)
AC_SUBST(SWIGLIB)
AC_SUBST(SWIGFLAGS)
AC_SUBST(SWIG_CPPFLAGS)
AC_SUBST(SWIG_LDFLAGS)
AC_SUBST(SWIG_LIBS)
+
+ else
+ dnl --with-swig not given. Use the simplest default.
+ SWIG=swig
+
fi
+ dnl Record the version of SWIG we need, for later testing.
+ dnl Note that this is always set, regardless of whether --with-swig is given.
+
+ SWIGNEEDVERSION=[$1]
+
+ dnl Do substitutions we always do.
+
+ AC_SUBST(SWIG)
+ AC_SUBST(SWIGNEEDVERSION)
+
dnl We record the USE_XXX flag, for later testing in Makefiles.
LIBSBML_OPTIONS="$LIBSBML_OPTIONS USE_SWIG"
Modified: branches/libsbml-5/config/univbinary.m4
===================================================================
--- branches/libsbml-5/config/univbinary.m4 2010-04-29 00:52:52 UTC (rev 11227)
+++ branches/libsbml-5/config/univbinary.m4 2010-04-29 11:15:38 UTC (rev 11228)
@@ -56,7 +56,17 @@
CFLAGS="${CFLAGS} $enable_univbinary"
CXXFLAGS="${CXXFLAGS} $enable_univbinary"
else
- default_OPTS="-arch i386 -arch ppc"
+ dnl If we're on Snow Leopard, build 64-bit versions of the binaries in
+ dnl addition to PPC versions, because Snow Leopard builds everything
+ dnl else in 64-bit by default. This makes libSBML more compatible.
+
+ OSX_MAJOR_VER=`uname -r | awk -F. '{print $1}'`
+ if expr ${OSX_MAJOR_VER} \>= 10 | grep -q 1; then
+ default_OPTS="-arch i386 -arch x86_64 -arch ppc"
+ elif expr ${OSX_MAJOR_VER} \>= 9 | grep -q 1; then
+ default_OPTS="-arch i386 -arch ppc"
+ fi
+
LDFLAGS="${LDFLAGS} ${default_OPTS}"
CFLAGS="${CFLAGS} ${default_OPTS}"
CXXFLAGS="${CXXFLAGS} ${default_OPTS}"
Modified: branches/libsbml-5/configure.ac
===================================================================
--- branches/libsbml-5/configure.ac 2010-04-29 00:52:52 UTC (rev 11227)
+++ branches/libsbml-5/configure.ac 2010-04-29 11:15:38 UTC (rev 11228)
@@ -229,6 +229,12 @@
CPPFLAGS=$saved_CPPFLAGS
+#
+# Checks --enable-universal-binary option
+# (CONFIG_LIB_UNIVBINARY must be located before CONFIG_PROG_MATLAB)
+#
+CONFIG_LIB_UNIVBINARY
+
# The Lisp language binding has been removed for the time being, because it
# no longer works in recent versions of libSBML.
@@ -330,9 +336,10 @@
dnl Output
dnl ---------------------------------------------------------------------------
+AC_CONFIG_FILES([config/makefile-common-vars.mk])
AC_CONFIG_FILES([config/lt_link_helper.sh], [chmod a+x config/lt_link_helper.sh])
-AC_CONFIG_FILES([config/makefile-common-vars.mk])
AC_CONFIG_FILES([config/mkoctfile_wrapper.sh], [chmod a+x config/mkoctfile_wrapper.sh])
+AC_CONFIG_FILES([config/chk_swig_version.sh], [chmod a+x config/chk_swig_version.sh])
AC_CONFIG_FILES([./Makefile])
AC_CONFIG_FILES([libsbml.spec])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mh...@us...> - 2010-04-29 00:52:59
|
Revision: 11227
http://sbml.svn.sourceforge.net/sbml/?rev=11227&view=rev
Author: mhucka
Date: 2010-04-29 00:52:52 +0000 (Thu, 29 Apr 2010)
Log Message:
-----------
Added missing declaration for Model_getSpeciesReferenceById.
Modified Paths:
--------------
branches/libsbml-5/src/sbml/Model.h
Modified: branches/libsbml-5/src/sbml/Model.h
===================================================================
--- branches/libsbml-5/src/sbml/Model.h 2010-04-28 23:57:25 UTC (rev 11226)
+++ branches/libsbml-5/src/sbml/Model.h 2010-04-29 00:52:52 UTC (rev 11227)
@@ -3845,6 +3845,11 @@
LIBSBML_EXTERN
+SpeciesReference_t *
+Model_getSpeciesReferenceById (Model_t *m, const char *sid);
+
+
+LIBSBML_EXTERN
Event_t *
Model_getEvent (Model_t *m, unsigned int n);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mh...@us...> - 2010-04-28 23:57:31
|
Revision: 11226
http://sbml.svn.sourceforge.net/sbml/?rev=11226&view=rev
Author: mhucka
Date: 2010-04-28 23:57:25 +0000 (Wed, 28 Apr 2010)
Log Message:
-----------
Updated list of ignored files.
Modified Paths:
--------------
trunk/libsbml/src/bindings/python/.svnignore
Property Changed:
----------------
trunk/libsbml/src/bindings/python/
Property changes on: trunk/libsbml/src/bindings/python
___________________________________________________________________
Modified: svn:ignore
- autom4te.cache
Makefile
config.log
config.status
.deps
include
TAGS
CTAGS
libsbml.pc
*.o
setup.py
build
_libsbml.so
pydoc.i
libsbml.py
libsbml.pyc
libsbml_wrap.cpp
test.xml.zip
test.xml.bz
test.xml.gz
.libs
+ autom4te.cache
Makefile
config.log
config.status
.deps
include
TAGS
CTAGS
libsbml.pc
*.o
setup.py
build
_libsbml.so
pydoc.i
libsbml.py
libsbml.pyc
libsbml_wrap.cpp
test.xml.zip
test.xml.bz
test.xml.bz2
test.xml.gz
.libs
Modified: trunk/libsbml/src/bindings/python/.svnignore
===================================================================
--- trunk/libsbml/src/bindings/python/.svnignore 2010-04-28 23:57:14 UTC (rev 11225)
+++ trunk/libsbml/src/bindings/python/.svnignore 2010-04-28 23:57:25 UTC (rev 11226)
@@ -17,5 +17,6 @@
libsbml_wrap.cpp
test.xml.zip
test.xml.bz
+test.xml.bz2
test.xml.gz
.libs
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mh...@us...> - 2010-04-28 23:57:20
|
Revision: 11225
http://sbml.svn.sourceforge.net/sbml/?rev=11225&view=rev
Author: mhucka
Date: 2010-04-28 23:57:14 +0000 (Wed, 28 Apr 2010)
Log Message:
-----------
Updated list of ignored files.
Modified Paths:
--------------
trunk/libsbml/src/bindings/ruby/.svnignore
Property Changed:
----------------
trunk/libsbml/src/bindings/ruby/
Property changes on: trunk/libsbml/src/bindings/ruby
___________________________________________________________________
Modified: svn:ignore
- autom4te.cache
Makefile
config.log
config.status
.deps
include
TAGS
CTAGS
libsbml.pc
*.o
libsbml_wrap.cpp
.libs
+ autom4te.cache
Makefile
config.log
config.status
.deps
include
TAGS
CTAGS
libsbml.pc
*.o
libsbml_wrap.cpp
.libs
test.xml.gz
test.xml.bz
test.xml.bz2
test.xml.zip
Modified: trunk/libsbml/src/bindings/ruby/.svnignore
===================================================================
--- trunk/libsbml/src/bindings/ruby/.svnignore 2010-04-28 23:56:41 UTC (rev 11224)
+++ trunk/libsbml/src/bindings/ruby/.svnignore 2010-04-28 23:57:14 UTC (rev 11225)
@@ -10,3 +10,8 @@
*.o
libsbml_wrap.cpp
.libs
+test.xml.gz
+test.xml.bz
+test.xml.bz2
+test.xml.zip
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mh...@us...> - 2010-04-28 23:56:48
|
Revision: 11224
http://sbml.svn.sourceforge.net/sbml/?rev=11224&view=rev
Author: mhucka
Date: 2010-04-28 23:56:41 +0000 (Wed, 28 Apr 2010)
Log Message:
-----------
Updated list of ignored files.
Modified Paths:
--------------
trunk/libsbml/src/bindings/java/.svnignore
Property Changed:
----------------
trunk/libsbml/src/bindings/java/
Property changes on: trunk/libsbml/src/bindings/java
___________________________________________________________________
Modified: svn:ignore
- autom4te.cache
Makefile
config.log
config.status
.deps
include
TAGS
CTAGS
libsbml.pc
*.o
java-files
*.jnilib
*.jar
libsbml_wrap.cpp
javadoc.i
test.xml.zip
test_write.xml
test.xml.bz
test_copy1.xml
TestFilenameFilter.class
test.xml.gz
out.xml
AutoTestRunner.class
.libs
+ autom4te.cache
Makefile
config.log
config.status
.deps
include
TAGS
CTAGS
libsbml.pc
*.o
java-files
*.jnilib
*.jar
libsbml_wrap.cpp
javadoc.i
test.xml.zip
test_write.xml
test.xml.bz
test.xml.bz2
test_copy1.xml
TestFilenameFilter.class
test.xml.gz
out.xml
AutoTestRunner.class
.libs
Modified: trunk/libsbml/src/bindings/java/.svnignore
===================================================================
--- trunk/libsbml/src/bindings/java/.svnignore 2010-04-27 18:44:32 UTC (rev 11223)
+++ trunk/libsbml/src/bindings/java/.svnignore 2010-04-28 23:56:41 UTC (rev 11224)
@@ -16,6 +16,7 @@
test.xml.zip
test_write.xml
test.xml.bz
+test.xml.bz2
test_copy1.xml
TestFilenameFilter.class
test.xml.gz
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sar...@us...> - 2010-04-27 18:44:40
|
Revision: 11223
http://sbml.svn.sourceforge.net/sbml/?rev=11223&view=rev
Author: sarahkeating
Date: 2010-04-27 18:44:32 +0000 (Tue, 27 Apr 2010)
Log Message:
-----------
merging changes from 4.1
Modified Paths:
--------------
branches/libsbml-5/src/sbml/Compartment.cpp
branches/libsbml-5/src/sbml/Compartment.h
branches/libsbml-5/src/sbml/CompartmentType.cpp
branches/libsbml-5/src/sbml/CompartmentType.h
branches/libsbml-5/src/sbml/Constraint.cpp
branches/libsbml-5/src/sbml/Constraint.h
branches/libsbml-5/src/sbml/Delay.cpp
branches/libsbml-5/src/sbml/Delay.h
branches/libsbml-5/src/sbml/Event.cpp
branches/libsbml-5/src/sbml/Event.h
branches/libsbml-5/src/sbml/EventAssignment.cpp
branches/libsbml-5/src/sbml/EventAssignment.h
branches/libsbml-5/src/sbml/FunctionDefinition.cpp
branches/libsbml-5/src/sbml/FunctionDefinition.h
branches/libsbml-5/src/sbml/InitialAssignment.cpp
branches/libsbml-5/src/sbml/InitialAssignment.h
branches/libsbml-5/src/sbml/KineticLaw.cpp
branches/libsbml-5/src/sbml/KineticLaw.h
branches/libsbml-5/src/sbml/LocalParameter.cpp
branches/libsbml-5/src/sbml/LocalParameter.h
branches/libsbml-5/src/sbml/Model.cpp
branches/libsbml-5/src/sbml/Model.h
branches/libsbml-5/src/sbml/Parameter.cpp
branches/libsbml-5/src/sbml/Parameter.h
branches/libsbml-5/src/sbml/Reaction.cpp
branches/libsbml-5/src/sbml/Reaction.h
branches/libsbml-5/src/sbml/Rule.cpp
branches/libsbml-5/src/sbml/Rule.h
branches/libsbml-5/src/sbml/SBMLConvert.cpp
branches/libsbml-5/src/sbml/SBMLDocument.cpp
branches/libsbml-5/src/sbml/SBMLError.cpp
branches/libsbml-5/src/sbml/SBMLError.h
branches/libsbml-5/src/sbml/SBMLErrorTable.h
branches/libsbml-5/src/sbml/SBMLReader.cpp
branches/libsbml-5/src/sbml/SBMLReader.h
branches/libsbml-5/src/sbml/SBMLTransforms.h
branches/libsbml-5/src/sbml/SBO.cpp
branches/libsbml-5/src/sbml/SBO.h
branches/libsbml-5/src/sbml/SBase.cpp
branches/libsbml-5/src/sbml/Species.cpp
branches/libsbml-5/src/sbml/Species.h
branches/libsbml-5/src/sbml/SpeciesReference.cpp
branches/libsbml-5/src/sbml/SpeciesReference.h
branches/libsbml-5/src/sbml/SpeciesType.cpp
branches/libsbml-5/src/sbml/SpeciesType.h
branches/libsbml-5/src/sbml/StoichiometryMath.cpp
branches/libsbml-5/src/sbml/StoichiometryMath.h
branches/libsbml-5/src/sbml/Trigger.cpp
branches/libsbml-5/src/sbml/Trigger.h
branches/libsbml-5/src/sbml/Unit.cpp
branches/libsbml-5/src/sbml/Unit.h
branches/libsbml-5/src/sbml/UnitDefinition.cpp
branches/libsbml-5/src/sbml/UnitDefinition.h
branches/libsbml-5/src/sbml/UnitKind.c
branches/libsbml-5/src/sbml/UnitKind.h
branches/libsbml-5/src/sbml/test/TestInternalConsistencyChecks.cpp
branches/libsbml-5/src/sbml/test/TestL3Compartment.c
branches/libsbml-5/src/sbml/test/TestL3Event.c
branches/libsbml-5/src/sbml/test/TestL3Model.c
branches/libsbml-5/src/sbml/test/TestL3Parameter.c
branches/libsbml-5/src/sbml/test/TestL3Reaction.c
branches/libsbml-5/src/sbml/test/TestL3SpeciesReference.c
branches/libsbml-5/src/sbml/test/TestL3Unit.c
branches/libsbml-5/src/sbml/test/TestModel.c
branches/libsbml-5/src/sbml/test/TestRunner.c
branches/libsbml-5/src/sbml/test/TestSBMLConvert.c
branches/libsbml-5/src/sbml/test/TestSBMLTransforms.cpp
branches/libsbml-5/src/sbml/test/TestWriteL3SBML.cpp
Modified: branches/libsbml-5/src/sbml/Compartment.cpp
===================================================================
--- branches/libsbml-5/src/sbml/Compartment.cpp 2010-04-27 18:42:59 UTC (rev 11222)
+++ branches/libsbml-5/src/sbml/Compartment.cpp 2010-04-27 18:44:32 UTC (rev 11223)
@@ -66,7 +66,7 @@
}
Compartment::Compartment(SBMLNamespaces * sbmlns) :
- SBase ( sbmlns )
+ SBase ( sbmlns )
, mId ( "" )
, mName ( "" )
, mSpatialDimensions( 3 )
@@ -939,27 +939,36 @@
const unsigned int level = getLevel ();
const unsigned int version = getVersion();
- if (level == 1)
+ switch (level)
{
+ case 1:
+ attributes.add("name");
+ attributes.add("units");
+ attributes.add("outside");
attributes.add("volume");
+ break;
+ case 2:
+ attributes.add("name");
+ attributes.add("units");
attributes.add("outside");
- }
- else
- {
attributes.add("id");
attributes.add("size");
attributes.add("spatialDimensions");
attributes.add("constant");
-
- if (level == 2)
+ if (version > 1)
{
- attributes.add("outside");
-
- if (version > 1)
- {
- attributes.add("compartmentType");
- }
+ attributes.add("compartmentType");
}
+ break;
+ case 3:
+ default:
+ attributes.add("name");
+ attributes.add("units");
+ attributes.add("id");
+ attributes.add("size");
+ attributes.add("spatialDimensions");
+ attributes.add("constant");
+ break;
}
}
@@ -974,29 +983,102 @@
Compartment::readAttributes (const XMLAttributes& attributes,
const ExpectedAttributes& expectedAttributes)
{
+ const unsigned int level = getLevel ();
+ const unsigned int version = getVersion();
+
SBase::readAttributes(attributes, expectedAttributes);
- const unsigned int level = getLevel ();
+ switch (level)
+ {
+ case 1:
+ readL1Attributes(attributes);
+ break;
+ case 2:
+ readL2Attributes(attributes);
+ break;
+ case 3:
+ default:
+ readL3Attributes(attributes);
+ break;
+ }
+}
+/** @endcond doxygen-libsbml-internal */
+
+
+/** @cond doxygen-libsbml-internal */
+/*
+ * Subclasses should override this method to read values from the given
+ * XMLAttributes set into their specific fields. Be sure to call your
+ * parents implementation of this method as well.
+ */
+void
+Compartment::readL1Attributes (const XMLAttributes& attributes)
+{
+ const unsigned int level = 1;
const unsigned int version = getVersion();
//
// name: SName { use="required" } (L1v1, L1v2)
+ //
+ bool assigned = attributes.readInto("name", mId, getErrorLog(), true);
+ if (assigned && mId.size() == 0)
+ {
+ logEmptyString("name", level, version, "<compartment>");
+ }
+ if (!SyntaxChecker::isValidSBMLSId(mId)) logError(InvalidIdSyntax);
+
+ //
+ // volume { use="optional" default="1" } (L1v1, L1v2)
+ //
+ mIsSetSize = attributes.readInto("volume", mSize, getErrorLog(), false);
+
+ //
+ // units { use="optional" } (L1v1 ->)
+ //
+ assigned = attributes.readInto("units", mUnits, getErrorLog(), false);
+ if (assigned && mUnits.size() == 0)
+ {
+ logEmptyString("units", level, version, "<compartment>");
+ }
+ if (!SyntaxChecker::isValidUnitSId(mUnits))
+ {
+ logError(InvalidUnitIdSyntax);
+ }
+
+ //
+ // outside { use="optional" } (L1v1 -> L2v4)
+ //
+ attributes.readInto("outside", mOutside, getErrorLog(), false);
+}
+/** @endcond doxygen-libsbml-internal */
+
+
+/** @cond doxygen-libsbml-internal */
+/*
+ * Subclasses should override this method to read values from the given
+ * XMLAttributes set into their specific fields. Be sure to call your
+ * parents implementation of this method as well.
+ */
+void
+Compartment::readL2Attributes (const XMLAttributes& attributes)
+{
+ const unsigned int level = 2;
+ const unsigned int version = getVersion();
+
+ //
// id: SId { use="required" } (L2v1 ->)
//
- const string id = (level == 1) ? "name" : "id";
- bool assigned = attributes.readInto(id, mId, getErrorLog(), true);
+ bool assigned = attributes.readInto("id", mId, getErrorLog(), true);
if (assigned && mId.size() == 0)
{
- logEmptyString(id, level, version, "<compartment>");
+ logEmptyString("id", level, version, "<compartment>");
}
if (!SyntaxChecker::isValidSBMLSId(mId)) logError(InvalidIdSyntax);
//
- // volume { use="optional" default="1" } (L1v1, L1v2)
// size { use="optional" } (L2v1 ->)
//
- const string size = (level == 1) ? "volume" : "size";
- mIsSetSize = attributes.readInto(size, mSize, getErrorLog(), false);
+ mIsSetSize = attributes.readInto("size", mSize, getErrorLog(), false);
//
// units { use="optional" } (L1v1 ->)
@@ -1014,69 +1096,114 @@
//
// outside { use="optional" } (L1v1 -> L2v4)
//
- if (level < 3)
+ attributes.readInto("outside", mOutside, getErrorLog(), false);
+
+ //
+ // name: string { use="optional" } (L2v1 ->)
+ //
+ attributes.readInto("name", mName, getErrorLog(), false);
+
+ //
+ // spatialDimensions { maxInclusive="3" minInclusive="0" use="optional"
+ // default="3" } (L2v1 ->)
+ attributes.readInto("spatialDimensions", mSpatialDimensions,
+ getErrorLog(), false);
+ if (mSpatialDimensions < 0 || mSpatialDimensions > 3)
{
- attributes.readInto("outside", mOutside, getErrorLog(), false);
+ std::string message = "The spatialDimensions attribute on ";
+ message += "a <compartment> may only have values 0, 1, 2 or 3.";
+ getErrorLog()->logError(NotSchemaConformant, level, version,
+ message);
}
+ else
+ {
+ // keep record as double
+ mSpatialDimensionsDouble = (double)(mSpatialDimensions);
+ mIsSetSpatialDimensions = true;
+ }
- if (level > 1)
+ //
+ // constant { use="optional" default="true" } (L2v1 ->)
+ //
+ attributes.readInto("constant", mConstant, getErrorLog(), false);
+
+ //
+ // compartmentType: SId { use="optional" } (L2v2 -> L2v4)
+ //
+ if (version != 1)
{
- //
- // name: string { use="optional" } (L2v1 ->)
- //
- attributes.readInto("name", mName, getErrorLog(), false);
-
- //
- // spatialDimensions { maxInclusive="3" minInclusive="0" use="optional"
- // default="3" } (L2v1 ->)
- // spatialDimensions { use="optional"} (L3v1 ->)
- //
- if (level < 3)
- {
- attributes.readInto("spatialDimensions", mSpatialDimensions,
- getErrorLog(), false);
- if (mSpatialDimensions < 0 || mSpatialDimensions > 3)
- {
- std::string message = "The spatialDimensions attribute on ";
- message += "a <compartment> may only have values 0, 1, 2 or 3.";
- getErrorLog()->logError(NotSchemaConformant, level, version,
- message);
- }
- }
- else
- {
- mIsSetSpatialDimensions = attributes.readInto("spatialDimensions",
- mSpatialDimensionsDouble, getErrorLog(), false);
- }
-
- //
- // constant { use="optional" default="true" } (L2v1 ->)
- // constant { use="required" } (L3v1 ->)
- //
- if (level < 3)
- {
- attributes.readInto("constant", mConstant, getErrorLog(), false);
- }
- else
- {
- mIsSetConstant = attributes.readInto("constant", mConstant,
- getErrorLog(), true);
- }
+ attributes.readInto("compartmentType", mCompartmentType,
+ getErrorLog(), false);
+ }
+}
+/** @endcond doxygen-libsbml-internal */
- //
- // compartmentType: SId { use="optional" } (L2v2 -> L2v4)
- //
- if ( level == 2 && version != 1)
- {
- attributes.readInto("compartmentType", mCompartmentType,
- getErrorLog(), false);
- }
- //
- // sboTerm: SBOTerm { use="optional" } (L2v3 ->)
- // is read in SBase::readAttributes()
- //
+/** @cond doxygen-libsbml-internal */
+/*
+ * Subclasses should override this method to read values from the given
+ * XMLAttributes set into their specific fields. Be sure to call your
+ * parents implementation of this method as well.
+ */
+void
+Compartment::readL3Attributes (const XMLAttributes& attributes)
+{
+ const unsigned int level = 3;
+ const unsigned int version = getVersion();
+
+ //
+ // id: SId { use="required" } (L2v1 ->)
+ //
+ bool assigned = attributes.readInto("id", mId, getErrorLog());
+ if (!assigned)
+ {
+ getErrorLog()->logError(AllowedAttributesOnCompartment, level, version);
}
+ if (assigned && mId.size() == 0)
+ {
+ logEmptyString("id", level, version, "<compartment>");
+ }
+ if (!SyntaxChecker::isValidSBMLSId(mId)) logError(InvalidIdSyntax);
+
+ //
+ // size { use="optional" } (L2v1 ->)
+ //
+ mIsSetSize = attributes.readInto("size", mSize, getErrorLog(), false);
+
+ //
+ // units { use="optional" } (L1v1 ->)
+ //
+ assigned = attributes.readInto("units", mUnits, getErrorLog(), false);
+ if (assigned && mUnits.size() == 0)
+ {
+ logEmptyString("units", level, version, "<compartment>");
+ }
+ if (!SyntaxChecker::isValidUnitSId(mUnits))
+ {
+ logError(InvalidUnitIdSyntax);
+ }
+
+
+ //
+ // name: string { use="optional" } (L2v1 ->)
+ //
+ attributes.readInto("name", mName, getErrorLog(), false);
+
+ //
+ // spatialDimensions { use="optional"} (L3v1 ->)
+ //
+ mIsSetSpatialDimensions = attributes.readInto("spatialDimensions",
+ mSpatialDimensionsDouble, getErrorLog(), false);
+
+ //
+ // constant { use="required" } (L3v1 ->)
+ //
+ mIsSetConstant = attributes.readInto("constant", mConstant,
+ getErrorLog());
+ if (!mIsSetConstant)
+ {
+ logError(AllowedAttributesOnCompartment, level, version);
+ }
}
/** @endcond doxygen-libsbml-internal */
Modified: branches/libsbml-5/src/sbml/Compartment.h
===================================================================
--- branches/libsbml-5/src/sbml/Compartment.h 2010-04-27 18:42:59 UTC (rev 11222)
+++ branches/libsbml-5/src/sbml/Compartment.h 2010-04-27 18:44:32 UTC (rev 11223)
@@ -1090,7 +1090,13 @@
virtual void readAttributes (const XMLAttributes& attributes,
const ExpectedAttributes& expectedAttributes);
+ void readL1Attributes (const XMLAttributes& attributes);
+ void readL2Attributes (const XMLAttributes& attributes);
+
+ void readL3Attributes (const XMLAttributes& attributes);
+
+
/**
* Subclasses should override this method to write their XML attributes
* to the XMLOutputStream. Be sure to call your parents implementation
Modified: branches/libsbml-5/src/sbml/CompartmentType.cpp
===================================================================
--- branches/libsbml-5/src/sbml/CompartmentType.cpp 2010-04-27 18:42:59 UTC (rev 11222)
+++ branches/libsbml-5/src/sbml/CompartmentType.cpp 2010-04-27 18:44:32 UTC (rev 11223)
@@ -355,18 +355,50 @@
CompartmentType::readAttributes (const XMLAttributes& attributes,
const ExpectedAttributes& expectedAttributes)
{
+ const unsigned int level = getLevel ();
+ const unsigned int version = getVersion();
+
SBase::readAttributes(attributes, expectedAttributes);
- const unsigned int level = getLevel();
- const unsigned int version = getVersion();
-
- if (level < 2 || (level == 2 && version == 1))
+ switch (level)
{
- logError(NotSchemaConformant, getLevel(), getVersion(),
+ case 1:
+ logError(NotSchemaConformant, level, version,
"CompartmentType is not a valid component for this level/version.");
- return;
+ break;
+ case 2:
+ if (version == 1)
+ {
+ logError(NotSchemaConformant, level, version,
+ "CompartmentType is not a valid component for this level/version.");
+ }
+ else
+ {
+ readL2Attributes(attributes);
+ }
+ break;
+ case 3:
+ default:
+ logError(NotSchemaConformant, level, version,
+ "CompartmentType is not a valid component for this level/version.");
+ break;
}
+}
+/** @endcond doxygen-libsbml-internal */
+
+/** @cond doxygen-libsbml-internal */
+/*
+ * Subclasses should override this method to read values from the given
+ * XMLAttributes set into their specific fields. Be sure to call your
+ * parents implementation of this method as well.
+ */
+void
+CompartmentType::readL2Attributes (const XMLAttributes& attributes)
+{
+ const unsigned int level = getLevel ();
+ const unsigned int version = getVersion();
+
//
// id: SId { use="required" } (L2v2 ->)
//
@@ -381,10 +413,6 @@
// name: string { use="optional" } (L2v2 ->)
//
attributes.readInto("name", mName);
- //
- // sboTerm: SBOTerm { use="optional" } (L2v3 ->)
- // is read in SBase::readAttributes()
- //
}
/** @endcond doxygen-libsbml-internal */
Modified: branches/libsbml-5/src/sbml/CompartmentType.h
===================================================================
--- branches/libsbml-5/src/sbml/CompartmentType.h 2010-04-27 18:42:59 UTC (rev 11222)
+++ branches/libsbml-5/src/sbml/CompartmentType.h 2010-04-27 18:44:32 UTC (rev 11223)
@@ -405,6 +405,9 @@
const ExpectedAttributes& expectedAttributes);
+ void readL2Attributes (const XMLAttributes& attributes);
+
+
/**
* Subclasses should override this method to write their XML attributes
* to the XMLOutputStream. Be sure to call your parents implementation
Modified: branches/libsbml-5/src/sbml/Constraint.cpp
===================================================================
--- branches/libsbml-5/src/sbml/Constraint.cpp 2010-04-27 18:42:59 UTC (rev 11222)
+++ branches/libsbml-5/src/sbml/Constraint.cpp 2010-04-27 18:44:32 UTC (rev 11223)
@@ -366,9 +366,22 @@
return false;
}
+ if (mMath)
+ {
+ if (getLevel() < 3)
+ {
+ logError(NotSchemaConformant, getLevel(), getVersion(),
+ "Only one <math> element is permitted inside a "
+ "particular containing element.");
+ }
+ else
+ {
+ logError(OneMathElementPerConstraint, getLevel(), getVersion());
+ }
+ }
// If there's a <message>, it's supposed to show up first
- if (mMessage) logError(IncorrectOrderInConstraint);
+ if (mMessage && getLevel() == 2) logError(IncorrectOrderInConstraint);
/* check for MathML namespace
* this may be explicitly declared here
@@ -417,6 +430,19 @@
}
else if (name == "message")
{
+ if (mMessage)
+ {
+ if (getLevel() < 3)
+ {
+ logError(NotSchemaConformant, getLevel(), getVersion(),
+ "Only one <message> element is permitted inside a "
+ "particular containing element.");
+ }
+ else
+ {
+ logError(OneMessageElementPerConstraint, getLevel(), getVersion());
+ }
+ }
delete mMessage;
mMessage = new XMLNode(stream);
@@ -476,33 +502,73 @@
Constraint::readAttributes (const XMLAttributes& attributes,
const ExpectedAttributes& expectedAttributes)
{
- const unsigned int level = getLevel();
+ const unsigned int level = getLevel ();
const unsigned int version = getVersion();
- if (level < 2 || (level == 2 && version == 1))
+ SBase::readAttributes(attributes, expectedAttributes);
+
+ switch (level)
{
- logError(NotSchemaConformant, getLevel(), getVersion(),
+ case 1:
+ logError(NotSchemaConformant, level, version,
"Constraint is not a valid component for this level/version.");
- return;
+ break;
+ case 2:
+ if (version == 1)
+ {
+ logError(NotSchemaConformant, level, version,
+ "Constraint is not a valid component for this level/version.");
+ }
+ else
+ {
+ readL2Attributes(attributes);
+ }
+ break;
+ case 3:
+ default:
+ readL3Attributes(attributes);
+ break;
}
+}
+/** @endcond doxygen-libsbml-internal */
- SBase::readAttributes(attributes,expectedAttributes);
+/** @cond doxygen-libsbml-internal */
+/*
+ * Subclasses should override this method to write their XML attributes
+ * to the XMLOutputStream. Be sure to call your parents implementation
+ * of this method as well.
+ */
+void
+Constraint::readL2Attributes (const XMLAttributes& attributes)
+{
+ const unsigned int level = getLevel();
+ const unsigned int version = getVersion();
+
//
// sboTerm: SBOTerm { use="optional" } (L2v2 -> )
//
- // sboTerm for L2V3 or later is read in SBase::readAttributes()
- //
- if ( (level == 2) && (version == 2) )
- {
- mSBOTerm = SBO::readTerm(attributes, this->getErrorLog());
- }
+ if (version == 2)
+ mSBOTerm = SBO::readTerm(attributes, this->getErrorLog(), level, version);
}
/** @endcond doxygen-libsbml-internal */
/** @cond doxygen-libsbml-internal */
/*
+ * Subclasses should override this method to read values from the given
+ * XMLAttributes set into their specific fields. Be sure to call your
+ * parents implementation of this method as well.
+ */
+void
+Constraint::readL3Attributes (const XMLAttributes& attributes)
+{
+}
+/** @endcond doxygen-libsbml-internal */
+
+
+/** @cond doxygen-libsbml-internal */
+/*
* Subclasses should override this method to write their XML attributes
* to the XMLOutputStream. Be sure to call your parents implementation
* of this method as well.
Modified: branches/libsbml-5/src/sbml/Constraint.h
===================================================================
--- branches/libsbml-5/src/sbml/Constraint.h 2010-04-27 18:42:59 UTC (rev 11222)
+++ branches/libsbml-5/src/sbml/Constraint.h 2010-04-27 18:44:32 UTC (rev 11223)
@@ -443,6 +443,11 @@
virtual void readAttributes (const XMLAttributes& attributes,
const ExpectedAttributes& expectedAttributes);
+ void readL2Attributes (const XMLAttributes& attributes);
+
+ void readL3Attributes (const XMLAttributes& attributes);
+
+
/**
* Subclasses should override this method to write their XML attributes
* to the XMLOutputStream. Be sure to call your parents implementation
Modified: branches/libsbml-5/src/sbml/Delay.cpp
===================================================================
--- branches/libsbml-5/src/sbml/Delay.cpp 2010-04-27 18:42:59 UTC (rev 11222)
+++ branches/libsbml-5/src/sbml/Delay.cpp 2010-04-27 18:44:32 UTC (rev 11223)
@@ -388,6 +388,19 @@
return false;
}
+ if (mMath)
+ {
+ if (getLevel() < 3)
+ {
+ logError(NotSchemaConformant, getLevel(), getVersion(),
+ "Only one <math> element is permitted inside a "
+ "particular containing element.");
+ }
+ else
+ {
+ logError(OneMathPerDelay, getLevel(), getVersion());
+ }
+ }
/* check for MathML namespace
* this may be explicitly declared here
* or implicitly declared on the whole document
@@ -468,28 +481,57 @@
Delay::readAttributes (const XMLAttributes& attributes,
const ExpectedAttributes& expectedAttributes)
{
- const unsigned int level = getLevel();
+ const unsigned int level = getLevel ();
const unsigned int version = getVersion();
- if (level < 2)
+ SBase::readAttributes(attributes, expectedAttributes);
+
+ switch (level)
{
- logError(NotSchemaConformant, getLevel(), getVersion(),
+ case 1:
+ logError(NotSchemaConformant, level, version,
"Delay is not a valid component for this level/version.");
- return;
+ break;
+ case 2:
+ readL2Attributes(attributes);
+ break;
+ case 3:
+ default:
+ readL3Attributes(attributes);
+ break;
}
+}
+/** @endcond doxygen-libsbml-internal */
- SBase::readAttributes(attributes,expectedAttributes);
- //
- // sboTerm: SBOTerm { use="optional" } (L2v3 ->)
- // is read in SBase::readAttributes()
- //
+/** @cond doxygen-libsbml-internal */
+/*
+ * Subclasses should override this method to read values from the given
+ * XMLAttributes set into their specific fields. Be sure to call your
+ * parents implementation of this method as well.
+ */
+void
+Delay::readL2Attributes (const XMLAttributes& attributes)
+{
}
/** @endcond doxygen-libsbml-internal */
/** @cond doxygen-libsbml-internal */
/*
+ * Subclasses should override this method to read values from the given
+ * XMLAttributes set into their specific fields. Be sure to call your
+ * parents implementation of this method as well.
+ */
+void
+Delay::readL3Attributes (const XMLAttributes& attributes)
+{
+}
+/** @endcond doxygen-libsbml-internal */
+
+
+/** @cond doxygen-libsbml-internal */
+/*
* Subclasses should override this method to write their XML attributes
* to the XMLOutputStream. Be sure to call your parents implementation
* of this method as well.
Modified: branches/libsbml-5/src/sbml/Delay.h
===================================================================
--- branches/libsbml-5/src/sbml/Delay.h 2010-04-27 18:42:59 UTC (rev 11222)
+++ branches/libsbml-5/src/sbml/Delay.h 2010-04-27 18:44:32 UTC (rev 11223)
@@ -523,6 +523,11 @@
virtual void readAttributes (const XMLAttributes& attributes,
const ExpectedAttributes& expectedAttributes);
+ void readL2Attributes (const XMLAttributes& attributes);
+
+ void readL3Attributes (const XMLAttributes& attributes);
+
+
/**
* Subclasses should override this method to write their XML attributes
* to the XMLOutputStream. Be sure to call your parents implementation
Modified: branches/libsbml-5/src/sbml/Event.cpp
===================================================================
--- branches/libsbml-5/src/sbml/Event.cpp 2010-04-27 18:42:59 UTC (rev 11222)
+++ branches/libsbml-5/src/sbml/Event.cpp 2010-04-27 18:44:32 UTC (rev 11223)
@@ -1002,14 +1002,27 @@
{
if (mEventAssignments.size() != 0)
{
- logError(NotSchemaConformant, getLevel(), getVersion(),
+ if (getLevel() < 3)
+ logError(NotSchemaConformant, getLevel(), getVersion(),
"Only one <listOfEventAssignments> elements is permitted "
"in a single <event> element.");
+ else
+ logError(OneListOfEventAssignmentsPerEvent, getLevel(), getVersion());
}
object = &mEventAssignments;
}
else if (name == "trigger")
{
+ if (mTrigger)
+ {
+ if (getLevel() < 3)
+ logError(NotSchemaConformant, getLevel(), getVersion(),
+ "Only one <trigger> elements is permitted "
+ "in a single <event> element.");
+ else
+ logError(MissingTriggerInEvent, getLevel(), getVersion());
+ }
+
delete mTrigger;
try
@@ -1032,9 +1045,12 @@
{
if (mDelay)
{
- logError(NotSchemaConformant, getLevel(), getVersion(),
+ if (getLevel() < 3)
+ logError(NotSchemaConformant, getLevel(), getVersion(),
"Only one <delay> element is permitted in a single "
"<event> element.");
+ else
+ logError(OnlyOneDelayPerEvent, getLevel(), getVersion());
}
delete mDelay;
@@ -1073,25 +1089,33 @@
{
SBase::addExpectedAttributes(attributes);
- attributes.add("name");
- attributes.add("id");
-
const unsigned int level = getLevel();
const unsigned int version = getVersion();
- if (level == 2 && version < 3)
+ switch (level)
{
- attributes.add("timeUnits");
- }
-
- if (level == 2 && version == 2)
- {
- attributes.add("sboTerm");
- }
-
- if (!(level == 2 && version < 4))
- {
+ case 2:
+ attributes.add("name");
+ attributes.add("id");
+ if (version < 3)
+ {
+ attributes.add("timeUnits");
+ }
+ if (version == 2)
+ {
+ attributes.add("sboTerm");
+ }
+ if (version == 4)
+ {
+ attributes.add("useValuesFromTriggerTime");
+ }
+ break;
+ case 3:
+ default:
+ attributes.add("name");
+ attributes.add("id");
attributes.add("useValuesFromTriggerTime");
+ break;
}
}
@@ -1105,18 +1129,39 @@
Event::readAttributes (const XMLAttributes& attributes,
const ExpectedAttributes& expectedAttributes)
{
- const unsigned int level = getLevel();
+ const unsigned int level = getLevel ();
const unsigned int version = getVersion();
- if (level < 2)
+ SBase::readAttributes(attributes, expectedAttributes);
+
+ switch (level)
{
- logError(NotSchemaConformant, getLevel(), getVersion(),
+ case 1:
+ logError(NotSchemaConformant, level, version,
"Event is not a valid component for this level/version.");
- return;
+ break;
+ case 2:
+ readL2Attributes(attributes);
+ break;
+ case 3:
+ default:
+ readL3Attributes(attributes);
+ break;
}
+}
- SBase::readAttributes(attributes,expectedAttributes);
+/** @cond doxygen-libsbml-internal */
+/*
+ * Subclasses should override this method to read values from the given
+ * XMLAttributes set into their specific fields. Be sure to call your
+ * parents implementation of this method as well.
+ */
+void
+Event::readL2Attributes (const XMLAttributes& attributes)
+{
+ const unsigned int level = getLevel();
+ const unsigned int version = getVersion();
//
// id: SId { use="optional" } (L2v1 ->)
//
@@ -1136,7 +1181,7 @@
// timeUnits: SId { use="optional" } (L2v1, L2v2)
// removed in l2v3
//
- if (level == 2 && version < 3)
+ if (version < 3)
{
assigned = attributes.readInto("timeUnits", mTimeUnits);
if (assigned && mTimeUnits.size() == 0)
@@ -1152,32 +1197,63 @@
//
// sboTerm: SBOTerm { use="optional" } (L2v2 ->)
//
- // sboTerm for L2V3 or later is read in SBase::readAttributes()
+ if (version == 2)
+ mSBOTerm = SBO::readTerm(attributes, this->getErrorLog(), level, version);
+
//
- if ( (level == 2) && (version == 2) )
+ // useValuesFromTriggerTime: bool {use="optional" default="true"} (L2V4 ->)
+ // useValuesFromTriggerTime: bool {use="optional" } (L3 ->)
+ //
+ if (version == 4)
{
- mSBOTerm = SBO::readTerm(attributes, this->getErrorLog());
+ attributes.readInto("useValuesFromTriggerTime", mUseValuesFromTriggerTime);
}
+}
+/** @endcond doxygen-libsbml-internal */
+
+
+/** @cond doxygen-libsbml-internal */
+/*
+ * Subclasses should override this method to read values from the given
+ * XMLAttributes set into their specific fields. Be sure to call your
+ * parents implementation of this method as well.
+ */
+void
+Event::readL3Attributes (const XMLAttributes& attributes)
+{
+ const unsigned int level = getLevel();
+ const unsigned int version = getVersion();
+
//
- // useValuesFromTriggerTime: bool {use="optional" default="true"} (L2V4 ->)
- // useValuesFromTriggerTime: bool {use="required" } (L3 ->)
+ // id: SId { use="optional" } (L2v1 ->)
//
- if (level == 2 && version == 4)
+ bool assigned = attributes.readInto("id", mId);
+ if (assigned && mId.size() == 0)
{
- attributes.readInto("useValuesFromTriggerTime", mUseValuesFromTriggerTime);
+ logEmptyString("id", level, version, "<event>");
}
- else if (level > 2)
- {
- mIsSetUseValuesFromTriggerTime = attributes.readInto(
+ if (!SyntaxChecker::isValidSBMLSId(mId)) logError(InvalidIdSyntax);
+
+ //
+ // name: string { use="optional" } (L2v1 ->)
+ //
+ attributes.readInto("name", mName);
+
+ //
+ // useValuesFromTriggerTime: bool {use="optional" } (L3 ->)
+ //
+ mIsSetUseValuesFromTriggerTime = attributes.readInto(
"useValuesFromTriggerTime", mUseValuesFromTriggerTime,
- getErrorLog(), true);
- }
+ getErrorLog(), false);
}
/** @endcond doxygen-libsbml-internal */
+/** @endcond doxygen-libsbml-internal */
+
+
/** @cond doxygen-libsbml-internal */
/*
* Subclasses should override this method to write their XML attributes
@@ -1240,7 +1316,7 @@
stream.writeAttribute("useValuesFromTriggerTime",
mUseValuesFromTriggerTime);
}
- else if (level > 2)
+ else if (level > 2 && isSetDelay())
{
stream.writeAttribute("useValuesFromTriggerTime",
mUseValuesFromTriggerTime);
Modified: branches/libsbml-5/src/sbml/Event.h
===================================================================
--- branches/libsbml-5/src/sbml/Event.h 2010-04-27 18:42:59 UTC (rev 11222)
+++ branches/libsbml-5/src/sbml/Event.h 2010-04-27 18:44:32 UTC (rev 11223)
@@ -968,7 +968,11 @@
virtual void readAttributes (const XMLAttributes& attributes,
const ExpectedAttributes& expectedAttributes);
+ void readL2Attributes (const XMLAttributes& attributes);
+
+ void readL3Attributes (const XMLAttributes& attributes);
+
/**
* Subclasses should override this method to write their XML attributes
* to the XMLOutputStream. Be sure to call your parents implementation
Modified: branches/libsbml-5/src/sbml/EventAssignment.cpp
===================================================================
--- branches/libsbml-5/src/sbml/EventAssignment.cpp 2010-04-27 18:42:59 UTC (rev 11222)
+++ branches/libsbml-5/src/sbml/EventAssignment.cpp 2010-04-27 18:44:32 UTC (rev 11223)
@@ -464,6 +464,19 @@
return false;
}
+ if (mMath)
+ {
+ if (getLevel() < 3)
+ {
+ logError(NotSchemaConformant, getLevel(), getVersion(),
+ "Only one <math> element is permitted inside a "
+ "particular containing element.");
+ }
+ else
+ {
+ logError(OneMathPerEventAssignment, getLevel(), getVersion());
+ }
+ }
/* check for MathML namespace
* this may be explicitly declared here
* or implicitly declared on the whole document
@@ -556,18 +569,40 @@
EventAssignment::readAttributes (const XMLAttributes& attributes,
const ExpectedAttributes& expectedAttributes)
{
- const unsigned int level = getLevel();
+ const unsigned int level = getLevel ();
const unsigned int version = getVersion();
- if (level < 2)
+ SBase::readAttributes(attributes, expectedAttributes);
+
+ switch (level)
{
- logError(NotSchemaConformant, getLevel(), getVersion(),
+ case 1:
+ logError(NotSchemaConformant, level, version,
"EventAssignment is not a valid component for this level/version.");
- return;
+ break;
+ case 2:
+ readL2Attributes(attributes);
+ break;
+ case 3:
+ default:
+ readL3Attributes(attributes);
+ break;
}
+}
+/** @endcond doxygen-libsbml-internal */
- SBase::readAttributes(attributes,expectedAttributes);
+/** @cond doxygen-libsbml-internal */
+/*
+ * Subclasses should override this method to read values from the given
+ * XMLAttributes set into their specific fields. Be sure to call your
+ * parents implementation of this method as well.
+ */
+void
+EventAssignment::readL2Attributes (const XMLAttributes& attributes)
+{
+ const unsigned int level = getLevel();
+ const unsigned int version = getVersion();
//
// variable: SId { use="required" } (L2v1 ->)
//
@@ -582,12 +617,37 @@
//
// sboTerm: SBOTerm { use="optional" } (L2v2 ->)
//
- // sboTerm for L2V3 or later is read in SBase::readAttributes()
+ if (version == 2)
+ mSBOTerm = SBO::readTerm(attributes, this->getErrorLog(), level, version);
+}
+/** @endcond doxygen-libsbml-internal */
+
+
+/** @cond doxygen-libsbml-internal */
+/*
+ * Subclasses should override this method to read values from the given
+ * XMLAttributes set into their specific fields. Be sure to call your
+ * parents implementation of this method as well.
+ */
+void
+EventAssignment::readL3Attributes (const XMLAttributes& attributes)
+{
+ const unsigned int level = getLevel();
+ const unsigned int version = getVersion();
+
//
- if ( (level == 2) && (version == 2) )
+ // variable: SId { use="required" } (L2v1 ->)
+ //
+ bool assigned = attributes.readInto("variable", mVariable);
+ if (!assigned)
{
- mSBOTerm = SBO::readTerm(attributes, this->getErrorLog());
+ getErrorLog()->logError(AllowedAttributesOnEventAssignment, level, version);
}
+ if (assigned && mVariable.size() == 0)
+ {
+ logEmptyString("variable", level, version, "<eventAssignment>");
+ }
+ if (!SyntaxChecker::isValidSBMLSId(mVariable)) logError(InvalidIdSyntax);
}
/** @endcond doxygen-libsbml-internal */
Modified: branches/libsbml-5/src/sbml/EventAssignment.h
===================================================================
--- branches/libsbml-5/src/sbml/EventAssignment.h 2010-04-27 18:42:59 UTC (rev 11222)
+++ branches/libsbml-5/src/sbml/EventAssignment.h 2010-04-27 18:44:32 UTC (rev 11223)
@@ -590,7 +590,11 @@
virtual void readAttributes (const XMLAttributes& attributes,
const ExpectedAttributes& expectedAttributes);
+ void readL2Attributes (const XMLAttributes& attributes);
+
+ void readL3Attributes (const XMLAttributes& attributes);
+
/**
* Subclasses should override this method to write their XML attributes
* to the XMLOutputStream. Be sure to call your parents implementation
Modified: branches/libsbml-5/src/sbml/FunctionDefinition.cpp
===================================================================
--- branches/libsbml-5/src/sbml/FunctionDefinition.cpp 2010-04-27 18:42:59 UTC (rev 11222)
+++ branches/libsbml-5/src/sbml/FunctionDefinition.cpp 2010-04-27 18:44:32 UTC (rev 11223)
@@ -531,6 +531,20 @@
return false;
}
+
+ if (mMath)
+ {
+ if (getLevel() < 3)
+ {
+ logError(NotSchemaConformant, getLevel(), getVersion(),
+ "Only one <math> element is permitted inside a "
+ "particular containing element.");
+ }
+ else
+ {
+ logError(OneMathElementPerFunc, getLevel(), getVersion());
+ }
+ }
/* check for MathML namespace
* this may be explicitly declared here
* or implicitly declared on the whole document
@@ -623,22 +637,46 @@
FunctionDefinition::readAttributes (const XMLAttributes& attributes,
const ExpectedAttributes& expectedAttributes)
{
- const unsigned int level = getLevel();
+ const unsigned int level = getLevel ();
const unsigned int version = getVersion();
- if (level < 2)
+ SBase::readAttributes(attributes, expectedAttributes);
+
+ switch (level)
{
- logError(NotSchemaConformant, getLevel(), getVersion(),
+ case 1:
+ logError(NotSchemaConformant, level, version,
"FunctionDefinition is not a valid component for this level/version.");
- return;
+ break;
+ case 2:
+ readL2Attributes(attributes);
+ break;
+ case 3:
+ default:
+ readL3Attributes(attributes);
+ break;
}
+}
+/** @endcond doxygen-libsbml-internal */
- SBase::readAttributes(attributes,expectedAttributes);
+/** @cond doxygen-libsbml-internal */
+/*
+ * Subclasses should override this method to read values from the given
+ * XMLAttributes set into their specific fields. Be sure to call your
+ * parents implementation of this method as well.
+ */
+void
+FunctionDefinition::readL2Attributes (const XMLAttributes& attributes)
+{
+ const unsigned int level = getLevel();
+ const unsigned int version = getVersion();
+
//
// id: SId { use="required" } (L2v1 ->)
//
- bool assigned = attributes.readInto("id", mId, getErrorLog(), true);
+ bool assigned;
+ assigned = attributes.readInto("id", mId, getErrorLog(), true);
if (assigned && mId.size() == 0)
{
logEmptyString("id", level, version, "<functionDefinition>");
@@ -653,13 +691,45 @@
//
// sboTerm: SBOTerm { use="optional" } (L2v2 ->)
//
- // sboTerm for L2V3 or later is read in SBase::readAttributes()
+ if (version == 2)
+ mSBOTerm = SBO::readTerm(attributes, this->getErrorLog(), level, version);
+
+}
+/** @endcond doxygen-libsbml-internal */
+
+
+/** @cond doxygen-libsbml-internal */
+/*
+ * Subclasses should override this method to read values from the given
+ * XMLAttributes set into their specific fields. Be sure to call your
+ * parents implementation of this method as well.
+ */
+void
+FunctionDefinition::readL3Attributes (const XMLAttributes& attributes)
+{
+ const unsigned int level = getLevel();
+ const unsigned int version = getVersion();
+
//
- if ( (level == 2) && (version == 2) )
+ // id: SId { use="required" } (L2v1 ->)
+ //
+ bool assigned;
+ assigned = attributes.readInto("id", mId, getErrorLog());
+ if (!assigned)
{
- mSBOTerm = SBO::readTerm(attributes, this->getErrorLog());
+ getErrorLog()->logError(AllowedAttributesOnFunc, level, version);
}
+ if (assigned && mId.size() == 0)
+ {
+ logEmptyString("id", level, version, "<functionDefinition>");
+ }
+ if (!SyntaxChecker::isValidSBMLSId(mId)) logError(InvalidIdSyntax);
+ //
+ // name: string { use="optional" } (L2v1 ->)
+ //
+ attributes.readInto("name", mName);
+
}
/** @endcond doxygen-libsbml-internal */
Modified: branches/libsbml-5/src/sbml/FunctionDefinition.h
===================================================================
--- branches/libsbml-5/src/sbml/FunctionDefinition.h 2010-04-27 18:42:59 UTC (rev 11222)
+++ branches/libsbml-5/src/sbml/FunctionDefinition.h 2010-04-27 18:44:32 UTC (rev 11223)
@@ -539,6 +539,11 @@
virtual void readAttributes (const XMLAttributes& attributes,
const ExpectedAttributes& expectedAttributes);
+ void readL2Attributes (const XMLAttributes& attributes);
+
+ void readL3Attributes (const XMLAttributes& attributes);
+
+
/**
* Subclasses should override this method to write their XML attributes
* to the XMLOutputStream. Be sure to call your parents implementation
Modified: branches/libsbml-5/src/sbml/InitialAssignment.cpp
===================================================================
--- branches/libsbml-5/src/sbml/InitialAssignment.cpp 2010-04-27 18:42:59 UTC (rev 11222)
+++ branches/libsbml-5/src/sbml/InitialAssignment.cpp 2010-04-27 18:44:32 UTC (rev 11223)
@@ -461,7 +461,20 @@
return false;
}
- /* check for MathML namespace
+ if (mMath)
+ {
+ if (getLevel() < 3)
+ {
+ logError(NotSchemaConformant, getLevel(), getVersion(),
+ "Only one <math> element is permitted inside a "
+ "particular containing element.");
+ }
+ else
+ {
+ logError(OneMathElementPerInitialAssign, getLevel(), getVersion());
+ }
+ }
+ /* check for MathML namespace
* this may be explicitly declared here
* or implicitly declared on the whole document
*/
@@ -552,15 +565,46 @@
const unsigned int level = getLevel ();
const unsigned int version = getVersion();
- if (level < 2 || (level == 2 && version == 1))
+ SBase::readAttributes(attributes, expectedAttributes);
+
+ switch (level)
{
- logError(NotSchemaConformant, getLevel(), getVersion(),
+ case 1:
+ logError(NotSchemaConformant, level, version,
"InitialAssignment is not a valid component for this level/version.");
- return;
+ break;
+ case 2:
+ if (version == 1)
+ {
+ logError(NotSchemaConformant, level, version,
+ "InitialAssignment is not a valid component for this level/version.");
+ }
+ else
+ {
+ readL2Attributes(attributes);
+ }
+ break;
+ case 3:
+ default:
+ readL3Attributes(attributes);
+ break;
}
+}
+/** @endcond doxygen-libsbml-internal */
- SBase::readAttributes(attributes,expectedAttributes);
+/** @cond doxygen-libsbml-internal */
+/*
+ * Subclasses should override this method to read values from the given
+ * XMLAttributes set into their specific fields. Be sure to call your
+ * parents implementation of this method as well.
+ */
+void
+InitialAssignment::readL2Attributes (const XMLAttributes& attributes)
+{
+ const unsigned int level = getLevel ();
+ const unsigned int version = getVersion();
+
//
// symbol: SId { use="required" } (L2v2 -> )
//
@@ -574,12 +618,38 @@
//
// sboTerm: SBOTerm { use="optional" } (L2v2 ->)
//
- // sboTerm for L2V3 or later is read in SBase::readAttributes()
+ if (version == 2)
+ mSBOTerm = SBO::readTerm(attributes, this->getErrorLog(), level, version);
+}
+/** @endcond doxygen-libsbml-internal */
+
+
+/** @cond doxygen-libsbml-internal */
+/*
+ * Subclasses should override this method to read values from the given
+ * XMLAttributes set into their specific fields. Be sure to call your
+ * parents implementation of this method as well.
+ */
+void
+InitialAssignment::readL3Attributes (const XMLAttributes& attributes)
+{
+ const unsigned int level = getLevel ();
+ const unsigned int version = getVersion();
+
//
- if ( (level == 2) && (version == 2) )
+ // symbol: SId { use="required" } (L2v2 -> )
+ //
+ bool assigned = attributes.readInto("symbol", mSymbol, getErrorLog());
+ if (!assigned)
{
- mSBOTerm = SBO::readTerm(attributes, this->getErrorLog());
+ getErrorLog()->logError(AllowedAttributesOnInitialAssign, level, version);
}
+ if (assigned && mSymbol.size() == 0)
+ {
+ logEmptyString("symbol", level, version, "<initialAssignment>");
+ }
+ if (!SyntaxChecker::isValidSBMLSId(mSymbol)) logError(InvalidIdSyntax);
+
}
/** @endcond doxygen-libsbml-internal */
Modified: branches/libsbml-5/src/sbml/InitialAssignment.h
===================================================================
--- branches/libsbml-5/src/sbml/InitialAssignment.h 2010-04-27 18:42:59 UTC (rev 11222)
+++ branches/libsbml-5/src/sbml/InitialAssignment.h 2010-04-27 18:44:32 UTC (rev 11223)
@@ -606,7 +606,11 @@
virtual void readAttributes (const XMLAttributes& attributes,
const ExpectedAttributes& expectedAttributes);
+ void readL2Attributes (const XMLAttributes& attributes);
+
+ void readL3Attributes (const XMLAttributes& attributes);
+
/**
* Subclasses should override this method to write their XML attributes
* to the XMLOutputStream. Be sure to call your parents implementation
Modified: branches/libsbml-5/src/sbml/KineticLaw.cpp
===================================================================
--- branches/libsbml-5/src/sbml/KineticLaw.cpp 2010-04-27 18:42:59 UTC (rev 11222)
+++ branches/libsbml-5/src/sbml/KineticLaw.cpp 2010-04-27 18:44:32 UTC (rev 11223)
@@ -1123,9 +1123,7 @@
{
if (mLocalParameters.size() != 0)
{
- logError(NotSchemaConformant, getLevel(), getVersion(),
- "Only one <listOfLocalParameters> elements is permitted "
- "in a given <kineticLaw> element.");
+ logError(OneListOfPerKineticLaw, getLevel(), getVersion());
}
object = &mLocalParameters;
}
@@ -1158,8 +1156,22 @@
delete mMath;
return false;
}
+ if (mMath)
+ {
+ if (getLevel() < 3)
+ {
+ logError(NotSchemaConformant, getLevel(), getVersion(),
+ "Only one <math> element is permitted inside a "
+ "particular containing element.");
+ }
+ else
+ {
+ logError(OneMathPerKineticLaw, getLevel(), getVersion());
+ }
+ }
- if (getNumParameters() > 0) logError(IncorrectOrderInKineticLaw);
+ if (getNumParameters() > 0 && getLevel() < 3)
+ logError(IncorrectOrderInKineticLaw);
/* check for MathML namespace
* this may be explicitly declared here
@@ -1233,24 +1245,27 @@
const unsigned int level = getLevel ();
const unsigned int version = getVersion();
- if (level == 1)
+ switch (level)
{
+ case 1:
attributes.add("formula");
attributes.add("timeUnits");
attributes.add("substanceUnits");
- }
- else
- {
- if (level == 2 && version == 1)
+ break;
+ case 2:
+ if (version == 1)
{
attributes.add("timeUnits");
attributes.add("substanceUnits");
}
-
- if (level == 2 && version == 2)
+ if (version == 2)
{
attributes.add("sboTerm");
}
+ break;
+ case 3:
+ default:
+ break;
}
}
@@ -1263,57 +1278,102 @@
KineticLaw::readAttributes (const XMLAttributes& attributes,
const ExpectedAttributes& expectedAttributes)
{
- SBase::readAttributes(attributes,expectedAttributes);
+ const unsigned int level = getLevel ();
+ const unsigned int version = getVersion();
+ SBase::readAttributes(attributes, expectedAttributes);
+
+ switch (level)
+ {
+ case 1:
+ readL1Attributes(attributes);
+ break;
+ case 2:
+ readL2Attributes(attributes);
+ break;
+ case 3:
+ default:
+ readL3Attributes(attributes);
+ break;
+ }
+}
+/** @endcond doxygen-libsbml-internal */
+
+
+/** @cond doxygen-libsbml-internal */
+/*
+ * Subclasses should override this method to read values from the given
+ * XMLAttributes set into their specific fields. Be sure to call your
+ * parents implementation of this method as well.
+ */
+void
+KineticLaw::readL1Attributes (const XMLAttributes& attributes)
+{
const unsigned int level = getLevel ();
const unsigned int version = getVersion();
- if (level == 1)
+ //
+ // formula: string { use="required" } (L1v1->)
+ //
+ attributes.readInto("formula", mFormula, getErrorLog(), true);
+
+ //
+ // timeUnits { use="optional" } (L1v1, L1v2, L2v1, L2v2)
+ //
+ attributes.readInto("timeUnits", mTimeUnits);
+
+ //
+ // substanceUnits { use="optional" } (L1v1, L1v2, L2v1, L2v2)
+ //
+ attributes.readInto("substanceUnits", mSubstanceUnits);
+
+}
+/** @endcond doxygen-libsbml-internal */
+
+
+/** @cond doxygen-libsbml-internal */
+/*
+ * Subclasses should override this method to read values from the given
+ * XMLAttributes set into their specific fields. Be sure to call your
+ * parents implementation of this method as well.
+ */
+void
+KineticLaw::readL2Attributes (const XMLAttributes& attributes)
+{
+ const unsigned int level = getLevel ();
+ const unsigned int version = getVersion();
+
+ if (version == 1)
{
//
- // formula: string { use="required" } (L1v1->)
+ // timeUnits { use="optional" } (L1v1, L1v2, L2v1)
//
- attributes.readInto("formula", mFormula, getErrorLog(), true);
-
- //
- // timeUnits { use="optional" } (L1v1, L1v2, L2v1, L2v2)
- // removed in l2v3
- //
attributes.readInto("timeUnits", mTimeUnits);
//
- // substanceUnits { use="optional" } (L1v1, L1v2, L2v1, L2v2)
- // removed in l2v3
+ // substanceUnits { use="optional" } (L1v1, L1v2, L2v1)
//
attributes.readInto("substanceUnits", mSubstanceUnits);
}
- else
- {
- if (level == 2 && version == 1)
- {
- //
- // timeUnits { use="optional" } (L1v1, L1v2, L2v1)
- // removed in l2v2
- //
- attributes.readInto("timeUnits", mTimeUnits);
- //
- // substanceUnits { use="optional" } (L1v1, L1v2, L2v1)
- // removed in l2v2
- //
- attributes.readInto("substanceUnits", mSubstanceUnits);
- }
+ //
+ // sboTerm: SBOTerm { use="optional" } (L2v2 ->)
+ //
+ if (version == 2)
+ mSBOTerm = SBO::readTerm(attributes, this->getErrorLog(), level, version);
+}
+/** @endcond doxygen-libsbml-internal */
- //
- // sboTerm: SBOTerm { use="optional" } (L2v2 ->)
- //
- // sboTerm for L2V3 or later is read in SBase::readAttributes()
- //
- if ( (level == 2) && (version == 2) )
- {
- mSBOTerm = SBO::readTerm(attributes, this->getErrorLog());
- }
- }
+
+/** @cond doxygen-libsbml-internal */
+/*
+ * Subclasses should override this method to read values from the given
+ * XMLAttributes set into their specific fields. Be sure to call your
+ * parents implementation of this method as well.
+ */
+void
+KineticLaw::readL3Attributes (const XMLAttributes& attributes)
+{
}
/** @endcond doxygen-libsbml-internal */
Modified: branches/libsbml-5/src/sbml/KineticLaw.h
===================================================================
--- branches/libsbml-5/src/sbml/KineticLaw.h 2010-04-27 18:42:59 UTC (rev 11222)
+++ branches/libsbml-5/src/sbml/KineticLaw.h 2010-04-27 18:44:32 UTC (rev 11223)
@@ -1047,6 +1047,13 @@
const ExpectedAttributes& expectedAttributes);
+ void readL1Attributes (const XMLAttributes& attributes);
+
+ void readL2Attributes (const XMLAttributes& attributes);
+
+ void readL3Attributes (const XMLAttributes& attributes);
+
+
/**
* Subclasses should override this method to write their XML attributes
* to the XMLOutputStream. Be sure to call your parents implementation
Modified: branches/libsbml-5/src/sbml/LocalParameter.cpp
===================================================================
--- branches/libsbml-5/src/sbml/LocalParameter.cpp 2010-04-27 18:42:59 UTC (rev 11222)
+++ branches/libsbml-5/src/sbml/LocalParameter.cpp 2010-04-27 18:44:32 UTC (rev 11223)
@@ -276,7 +276,7 @@
void
LocalParameter::addExpectedAttributes(ExpectedAttributes& attributes)
{
- SBase::addExpectedAttributes(attributes);
+ Parameter::addExpectedAttributes(attributes);
}
Modified: branches/libsbml-5/src/sbml/LocalParameter.h
===================================================================
--- branches/libsbml-5/src/sbml/LocalParameter.h 2010-04-27 18:42:59 UTC (rev 11222)
+++ branches/libsbml-5/src/sbml/LocalParameter.h 2010-04-27 18:44:32 UTC (rev 11223)
@@ -403,7 +403,9 @@
virtual void readAttributes (const XMLAttributes& attributes,
const ExpectedAttributes& expectedAttributes);
+ void readL3Attributes (const XMLAttributes& attributes);
+
/**
* Subclasses should override this method to write their XML attributes
* to the XMLOutputStream. Be sure to call your parents implementation
Modified: branches/libsbml-5/src/sbml/Model.cpp
===================================================================
--- branches/libsbml-5/src/sbml/Model.cpp 2010-04-27 18:42:59 UTC (rev 11222)
+++ branches/libsbml-5/src/sbml/Model.cpp 2010-04-27 18:44:32 UTC (rev 11223)
@@ -2837,6 +2837,42 @@
}
+/**
+ * Get a SpeciesReference object based on its identifier.
+ */
+SpeciesReference*
+Model::getSpeciesReference (const std::string& sid)
+{
+ SpeciesReference* sr = NULL;
+ for (unsigned int i = 0; i < getNumReactions(); i++)
+ {
+ sr = getReaction(i)->getReactant(sid);
+ if (sr) break;
+
+ sr = getReaction(i)->getProduct(sid);
+ if (sr) break;
+ }
+
+ return sr;
+}
+
+const SpeciesReference*
+Model::getSpeciesReference (const std::string& sid) const
+{
+ const SpeciesReference* sr = NULL;
+ for (unsigned int i = 0; i < getNumReactions(); i++)
+ {
+ sr = getReaction(i)->getReactant(sid);
+ if (sr) break;
+
+ sr = getReaction(i)->getProduct(sid);
+ if (sr) break;
+ }
+
+ return sr;
+}
+
+
/*
* @return the nth Event of this Model.
*/
@@ -3468,8 +3504,16 @@
*/
if (mAnnotation)
{
- logError(NotSchemaConformant, getLevel(), getVersion(),
- "Multiple <annotation> elements not permitted.");
+ if (getLevel() < 3)
+ {
+ logError(NotSchemaConformant, getLevel(), getVersion(),
+ "Only one <annotation> element is permitted inside a "
+ "particular containing element.");
+ }
+ else
+ {
+ logError(MultipleAnnotations, getLevel(), getVersion());
+ }
}
delete mAnnotation;
@@ -3532,7 +3576,14 @@
if (mFunctionDefinitions.size() != 0)
{
- logError(NotSchemaConformant);
+ if (getLevel() < 3)
+ {
+ logError(NotSchemaConformant);
+ }
+ else
+ {
+ logError(OneOfEachListOf);
+ }
}
object = &mFunctionDefinitions;
}
@@ -3541,7 +3592,14 @@
{
if (mUnitDefinitions.size() != 0)
{
- logError(NotSchemaConformant);
+ if (getLevel() < 3)
+ {
+ logError(NotSchemaConformant);
+ }
+ else
+ {
+ logError(OneOfEachListOf);
+ }
}
object = &mUnitDefinitions;
}
@@ -3580,7 +3638,14 @@
{
if (mCompartments.size() != 0)
{
- logError(NotSchemaConformant);
+ if (getLevel() < 3)
+ {
+ logError(NotSchemaConformant);
+ }
+ else
+ {
+ logError(OneOfEachListOf);
+ }
}
object = &mCompartments;
}
@@ -3589,7 +3654,14 @@
{
if (mSpecies.size() != 0)
{
- logError(NotSchemaConformant);
+ if (getLevel() < 3)
+ {
+ logError(NotSchemaConformant);
+ }
+ else
+ {
+ logError(OneOfEachListOf);
+ }
}
object = &mSpecies;
}
@@ -3598,7 +3670,14 @@
{
if (mParameters.size() != 0)
{
- logError(NotSchemaConformant);
+ if (getLevel() < 3)
+ {
+ logError(NotSchemaConformant);
+ }
+ else
+ {
+ logError(OneOfEachListOf);
+ }
}
object = &mParameters;
}
@@ -3611,7 +3690,14 @@
}
if (mInitialAssignments.size() != 0)
{
- logError(NotSchemaConformant);
+ if (getLevel() < 3)
+ {
+ logError(NotSchemaConformant);
+ }
+ else
+ {
+ logError(OneOfEachListOf);
+ }
}
object = &mInitialAssignments;
}
@@ -3620,7 +3706,14 @@
{
if (mRules.size() != 0)
{
- logError(NotSchemaConformant);
+ if (getLevel() < 3)
+ {
+ logError(NotSchemaConformant);
+ }
+ else
+ {
+ logError(OneOfEachListOf);
+ }
}
object = &mRules;
}
@@ -3633,7 +3726,14 @@
}
if (mConstraints.size() != 0)
{
- logError(NotSchemaConformant);
+ if (getLevel() < 3)
+ {
+ logError(NotSchemaConformant);
+ }
+ else
+ {
+ logError(OneOfEachListOf);
+ }
}
object = &mConstraints;
}
@@ -3642,7 +3742,14 @@
{
if (mReactions.size() != 0)
{
- logError(NotSchemaConformant);
+ if (getLevel() < 3)
+ {
+ logError(NotSchemaConformant);
+ }
+ else
+ {
+ logError(OneOfEachListOf);
+ }
}
object = &mReactions;
}
@@ -3655,7 +3762,14 @@
}
if (mEvents.size() != 0)
{
- logError(NotSchemaConformant);
+ if (getLevel() < 3)
+ {
+ logError(NotSchemaConformant);
+ }
+ else
+ {
+ logError(OneOfEachListOf);
+ }
}
object = &mEvents;
}
@@ -3692,20 +3806,23 @@
const unsigned int level = getLevel ();
const unsigned int version = getVersion();
- attributes.add("name");
-
- if (level > 1)
+ switch (level)
{
+ case 1:
+ attributes.add("name");
+ break;
+ case 2:
+ attributes.add("name");
attributes.add("id");
-
- if (level == 2 && version == 2)
+ if (version == 2)
{
attributes.add("sboTerm");
}
- }
-
- if (level > 2)
- {
+ break;
+ case 3:
+ default:
+ attributes.add("name");
+ attributes.add("id");
attributes.add("substanceUnits");
attributes.add("timeUnits");
attributes.add("volumeUnits");
@@ -3713,6 +3830,7 @@
attributes.add("lengthUnits");
attributes.add("extentUnits");
attributes.add("conversionFactor");
+ break;
}
}
@@ -3725,8 +3843,37 @@
Model::readAttributes (const XMLAttributes& attributes,
const ExpectedAttributes& expectedAttributes)
{
- SBase::readAttributes(attributes,expectedAttributes);
+ const unsigned int level = getLevel ();
+ const unsigned int version = getVersion();
+ SBase::readAttributes(attributes, expectedAttributes);
+
+ switch (level)
+ {
+ case 1:
+ readL1Attributes(attributes);
+ break;
+ case 2:
+ readL2Attributes(attributes);
+ break;
+ case 3:
+ default:
+ readL3Attributes(attributes);
+ break;
+ }
+}
+/** @endcond doxygen-libsbml-internal */
+
+
+/** @cond doxygen-libsbml-internal */
+/*
+ * Subclasses should override this method to read values from the given
+ * XMLAttributes set into their specific fields. Be sure to call your
+ * parents implementation of this method as well.
+ */
+void
+Model::readL1Attributes (const XMLAttributes& attributes)
+{
const unsigned int level = getLevel ();
const unsigned int version = getVersion();
@@ -3734,119 +3881,164 @@
// name: SName { use="optional" } (L1v1, L1v2)
// id: SId { use="optional" } (L2v1 -> )
//
- const string id = (level == 1) ? "name" : "id";
- bool assigned = attributes.readInto(id, mId, getErrorLog(), false);
+ bool assigned = attributes.readInto("name", mId, getErrorLog(), false);
if (assigned && mId.size() == 0)
{
- logEmptyString(id, level, version, "<model>");
+ logEmptyString("name", level, version, "<model>");
}
if (!SyntaxChecker::isValidSBMLSId(mId)) logError(InvalidIdSyntax);
- if (level > 1)
+}
+/** @endcond doxygen-libsbml-internal */
+
+
+/** @cond doxygen-libsbml-internal */
+/*
+ * Subclasses should ...
[truncated message content] |
|
From: <sar...@us...> - 2010-04-27 18:43:06
|
Revision: 11222
http://sbml.svn.sourceforge.net/sbml/?rev=11222&view=rev
Author: sarahkeating
Date: 2010-04-27 18:42:59 +0000 (Tue, 27 Apr 2010)
Log Message:
-----------
merging changes from 4.1
Modified Paths:
--------------
branches/libsbml-5/src/math/MathML.cpp
Modified: branches/libsbml-5/src/math/MathML.cpp
===================================================================
--- branches/libsbml-5/src/math/MathML.cpp 2010-04-27 18:41:52 UTC (rev 11221)
+++ branches/libsbml-5/src/math/MathML.cpp 2010-04-27 18:42:59 UTC (rev 11222)
@@ -638,10 +638,10 @@
if ( !units.empty() && name != "cn")
{
- //static_cast <SBMLErrorLog*>
- // (stream.getErrorLog())->logError(DisallowedMathUnitsUse,
- // stream.getSBMLNamespaces()->getLevel(),
- // stream.getSBMLNamespaces()->getVersion());
+ static_cast <SBMLErrorLog*>
+ (stream.getErrorLog())->logError(DisallowedMathUnitsUse,
+ stream.getSBMLNamespaces()->getLevel(),
+ stream.getSBMLNamespaces()->getVersion());
}
if (name == "apply" || name == "lambda" || name == "piecewise")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sar...@us...> - 2010-04-27 18:41:59
|
Revision: 11221
http://sbml.svn.sourceforge.net/sbml/?rev=11221&view=rev
Author: sarahkeating
Date: 2010-04-27 18:41:52 +0000 (Tue, 27 Apr 2010)
Log Message:
-----------
merging changes from 4.1
Modified Paths:
--------------
branches/libsbml-5/src/validator/constraints/CiElementMathCheck.cpp
branches/libsbml-5/src/validator/constraints/ConsistencyConstraints.cpp
branches/libsbml-5/src/validator/constraints/L3v1CompatibilityConstraints.cpp
branches/libsbml-5/src/validator/constraints/Makefile
branches/libsbml-5/src/validator/constraints/Makefile.in
branches/libsbml-5/src/validator/constraints/MathMLConsistencyConstraints.cpp
branches/libsbml-5/src/validator/constraints/OverDeterminedCheck.cpp
branches/libsbml-5/src/validator/constraints/PowerUnitsCheck.cpp
branches/libsbml-5/src/validator/constraints/PowerUnitsCheck.h
Added Paths:
-----------
branches/libsbml-5/src/validator/constraints/ValidCnUnitsValue.cpp
branches/libsbml-5/src/validator/constraints/ValidCnUnitsValue.h
Modified: branches/libsbml-5/src/validator/constraints/CiElementMathCheck.cpp
===================================================================
--- branches/libsbml-5/src/validator/constraints/CiElementMathCheck.cpp 2010-04-27 18:39:37 UTC (rev 11220)
+++ branches/libsbml-5/src/validator/constraints/CiElementMathCheck.cpp 2010-04-27 18:41:52 UTC (rev 11221)
@@ -129,14 +129,19 @@
if (!mLocalParameters.contains(name))
{
bool allowReactionId = true;
+ bool allowSpeciesRef = false;
if ( (m.getLevel() == 2) && (m.getVersion() == 1) )
allowReactionId = false;
+ if (m.getLevel() > 2)
+ allowSpeciesRef = true;
+
if (!m.getCompartment(name) &&
!m.getSpecies(name) &&
!m.getParameter(name) &&
- (!allowReactionId || !m.getReaction(name)) )
+ (!allowReactionId || !m.getReaction(name)) &&
+ (!allowSpeciesRef || !m.getSpeciesReference(name)) )
{
/* check whether we are in a kinetic law since there
* may be local parameters
Modified: branches/libsbml-5/src/validator/constraints/ConsistencyConstraints.cpp
===================================================================
--- branches/libsbml-5/src/validator/constraints/ConsistencyConstraints.cpp 2010-04-27 18:39:37 UTC (rev 11220)
+++ branches/libsbml-5/src/validator/constraints/ConsistencyConstraints.cpp 2010-04-27 18:41:52 UTC (rev 11221)
@@ -129,6 +129,122 @@
END_CONSTRAINT
+START_CONSTRAINT (20216, Model, x)
+{
+ // level 3
+ pre( m.getLevel() > 2);
+ pre( m.isSetConversionFactor());
+
+ const string& factor = m.getConversionFactor();
+ inv( m.getParameter( factor ) != NULL );
+}
+END_CONSTRAINT
+
+
+START_CONSTRAINT (20217, Model, x)
+{
+ // level 3
+ pre( m.getLevel() > 2);
+ pre( m.isSetTimeUnits());
+
+ const string& units = m.getTimeUnits();
+ const UnitDefinition* defn = m.getUnitDefinition(units);
+
+ inv_or( units == "second" );
+ inv_or( units == "dimensionless" );
+ inv_or( defn != NULL && defn->isVariantOfTime() );
+ inv_or( defn != NULL && defn->isVariantOfDimensionless() );
+}
+END_CONSTRAINT
+
+
+START_CONSTRAINT (20218, Model, x)
+{
+ // level 3
+ pre( m.getLevel() > 2);
+ pre( m.isSetVolumeUnits());
+
+ const string& units = m.getVolumeUnits();
+ const UnitDefinition* defn = m.getUnitDefinition(units);
+
+ inv_or( units == "litre" );
+ inv_or( units == "dimensionless" );
+ inv_or( defn != NULL && defn->isVariantOfVolume() );
+ inv_or( defn != NULL && defn->isVariantOfDimensionless() );
+}
+END_CONSTRAINT
+
+
+START_CONSTRAINT (20219, Model, x)
+{
+ // level 3
+ pre( m.getLevel() > 2);
+ pre( m.isSetAreaUnits());
+
+ const string& units = m.getAreaUnits();
+ const UnitDefinition* defn = m.getUnitDefinition(units);
+
+ inv_or( units == "dimensionless" );
+ inv_or( defn != NULL && defn->isVariantOfArea() );
+ inv_or( defn != NULL && defn->isVariantOfDimensionless() );
+}
+END_CONSTRAINT
+
+
+START_CONSTRAINT (20220, Model, x)
+{
+ // level 3
+ pre( m.getLevel() > 2);
+ pre( m.isSetLengthUnits());
+
+ const string& units = m.getLengthUnits();
+ const UnitDefinition* defn = m.getUnitDefinition(units);
+
+ inv_or( units == "metre" );
+ inv_or( units == "dimensionless" );
+ inv_or( defn != NULL && defn->isVariantOfLength() );
+ inv_or( defn != NULL && defn->isVariantOfDimensionless() );
+}
+END_CONSTRAINT
+
+
+START_CONSTRAINT (20221, Model, x)
+{
+ // level 3
+ pre( m.getLevel() > 2);
+ pre( m.isSetExtentUnits());
+
+ const string& units = m.getExtentUnits();
+ const UnitDefinition* defn = m.getUnitDefinition(units);
+
+ inv_or( units == "mole" );
+ inv_or( units == "item" );
+ inv_or( units == "dimensionless" );
+ inv_or( units == "avogadro" );
+ inv_or( units == "kilogram" );
+ inv_or( units == "gram" );
+ inv_or( defn != NULL && defn->isVariantOfSubstance() );
+ inv_or( defn != NULL && defn->isVariantOfDimensionless() );
+}
+END_CONSTRAINT
+
+
+START_CONSTRAINT (20705, Model, x)
+{
+ // level 3
+ pre( m.getLevel() > 2);
+ pre( m.isSetConversionFactor());
+
+ const string& factor = m.getConversionFactor();
+ const Parameter* p = m.getParameter(factor);
+
+ pre(p != NULL);
+
+ inv( p->getConstant() == true );
+}
+END_CONSTRAINT
+
+
// FunctionDefinition validation
START_CONSTRAINT (20301, FunctionDefinition, fd)
@@ -274,6 +390,18 @@
END_CONSTRAINT
+START_CONSTRAINT (20306, FunctionDefinition, fd)
+{
+ //only applies to level 3
+ pre( fd.getLevel() > 2 );
+
+ // fd must have exactly one math
+ inv( fd.isSetMath() );
+
+}
+END_CONSTRAINT
+
+
START_CONSTRAINT (99301, FunctionDefinition, fd)
{
// csymbol time shouldnt be used in function
@@ -347,6 +475,20 @@
"'coulomb' 'hertz' 'litre' 'ohm' 'steradian' 'dimensionless' 'item' "
"'lumen' 'pascal' 'tesla' 'farad' 'joule' 'lux' 'radian' 'volt'. ";
}
+ else if (ud.getLevel() == 3)
+ {
+ msg =
+ //"The value of the 'id' attribute in a <unitDefinition> must be of "
+ //"type 'UnitSId' and not be identical "
+ //"to any unit predefined in SBML.
+ "That is, the identifier must not be "
+ "the same as any of the following predefined units: 'ampere' 'avogadro' "
+ "'gram' "
+ "'katal' 'metre' 'second' 'watt' 'becquerel' 'gray' 'kelvin' 'mole' "
+ "'siemens' 'weber' 'candela' 'henry' 'kilogram' 'newton' 'sievert' "
+ "'coulomb' 'hertz' 'litre' 'ohm' 'steradian' 'dimensionless' 'item' "
+ "'lumen' 'pascal' 'tesla' 'farad' 'joule' 'lux' 'radian' 'volt'. ";
+ }
else
{
msg =
@@ -776,7 +918,14 @@
START_CONSTRAINT (20501, Compartment, c)
{
pre( c.getLevel() > 1);
- pre( c.getSpatialDimensions() == 0 );
+ if (c.getLevel() == 2)
+ {
+ pre( c.getSpatialDimensions() == 0 );
+ }
+ else
+ {
+ pre( c.getSpatialDimensionsAsDouble() == 0);
+ }
//msg =
// "The size of a <compartment> must not be set if the compartment's "
@@ -791,7 +940,14 @@
START_CONSTRAINT (20502, Compartment, c)
{
pre( c.getLevel() > 1);
- pre( c.getSpatialDimensions() == 0 );
+ if (c.getLevel() == 2)
+ {
+ pre( c.getSpatialDimensions() == 0 );
+ }
+ else
+ {
+ pre( c.getSpatialDimensionsAsDouble() == 0);
+ }
//msg =
// "If a <compartment> definition has a 'spatialDimensions' value of '0', "
@@ -808,8 +964,14 @@
START_CONSTRAINT (20503, Compartment, c)
{
pre( c.getLevel() > 1);
- pre( c.getSpatialDimensions() == 0 );
-
+ if (c.getLevel() == 2)
+ {
+ pre( c.getSpatialDimensions() == 0 );
+ }
+ else
+ {
+ pre( c.getSpatialDimensionsAsDouble() == 0);
+ }
//msg =
// "If a <compartment> definition has a 'spatialDimensions' value of '0', "
// "then its 'constant' attribute value must either default to or be set to "
@@ -1014,6 +1176,36 @@
}
END_CONSTRAINT
+START_CONSTRAINT (20511, Compartment, c)
+{
+ pre( c.getLevel() > 2);
+ pre( c.getSpatialDimensionsAsDouble() == 1);
+ pre( !(c.isSetUnits()));
+
+ inv( m.isSetLengthUnits());
+}
+END_CONSTRAINT
+
+START_CONSTRAINT (20512, Compartment, c)
+{
+ pre( c.getLevel() > 2);
+ pre( c.getSpatialDimensionsAsDouble() == 2);
+ pre( !(c.isSetUnits()));
+
+ inv( m.isSetAreaUnits());
+}
+END_CONSTRAINT
+
+START_CONSTRAINT (20513, Compartment, c)
+{
+ pre( c.getLevel() > 2);
+ pre( c.getSpatialDimensionsAsDouble() == 3);
+ pre( !(c.isSetUnits()));
+
+ inv( m.isSetVolumeUnits());
+}
+END_CONSTRAINT
+
// Species validation
START_CONSTRAINT (20601, Species, s)
@@ -1213,9 +1405,9 @@
"'mole' (with an 'exponent' of '1') or 'item' (with an 'exponent' "
"of '1').";
}
- else
+ else if (s.getLevel() == 2)
{
- if (s.getLevel() == 2 && s.getVersion() == 1)
+ if (s.getVersion() == 1)
{
msg =
"The value of a <species>'s 'substanceUnits' attribute can only be one "
@@ -1235,6 +1427,16 @@
"of '1'), or 'dimensionless'.";
}
}
+ else
+ {
+ msg =
+ "The value of a <species>'s 'substanceUnits' attribute can only be one "
+ "of the following: 'substance', 'mole', 'item', 'gram', 'kilogram', "
+ "'dimensionless', 'avogadro' or the identifier of a <unitDefinition> derived from "
+ "'mole' (with an 'exponent' of '1'), 'item' (with an 'exponent' of '1')"
+ ", 'gram' (with an 'exponent' of '1'), 'kilogram' (with an 'exponent' "
+ "of '1'), 'avogadro' (with an 'exponent' of '1') or 'dimensionless'.";
+ }
const string& units = s.getSubstanceUnits();
const UnitDefinition* defn = m.getUnitDefinition(units);
@@ -1248,7 +1450,7 @@
inv_or( units == "mole" );
inv_or( defn != NULL && defn->isVariantOfSubstance() );
}
- else
+ else if (s.getLevel() == 2)
{
inv_or( units == "substance" );
inv_or( units == "item" );
@@ -1260,6 +1462,19 @@
inv_or( defn != NULL && defn->isVariantOfDimensionless() );
inv_or( defn != NULL && defn->isVariantOfMass() );
}
+ else if (s.getLevel() == 3)
+ {
+ inv_or( units == "substance" );
+ inv_or( units == "item" );
+ inv_or( units == "mole" );
+ inv_or( units == "dimensionless" );
+ inv_or( units == "gram" );
+ inv_or( units == "kilogram" );
+ inv_or( units == "avogadro" );
+ inv_or( defn != NULL && defn->isVariantOfSubstance() );
+ inv_or( defn != NULL && defn->isVariantOfDimensionless() );
+ inv_or( defn != NULL && defn->isVariantOfMass() );
+ }
}
END_CONSTRAINT
@@ -1329,6 +1544,8 @@
START_CONSTRAINT (20614, Species, s)
{
+ // level 3 catches this elsewhere
+ pre (s.getLevel() < 3);
//msg =
// "The 'compartment' attribute in a <species> is mandatory. A <species> "
// "definition in a model must include a value for this attribute. "
@@ -1356,6 +1573,43 @@
END_CONSTRAINT
+START_CONSTRAINT (20616, Species, s)
+{
+ pre( s.getLevel() > 2);
+ pre( !(s.isSetSubstanceUnits()));
+
+ inv( m.isSetSubstanceUnits());
+}
+END_CONSTRAINT
+
+
+START_CONSTRAINT (20617, Species, s)
+{
+ // level 3
+ pre( s.getLevel() > 2);
+ pre( s.isSetConversionFactor());
+
+ const string& factor = s.getConversionFactor();
+ inv( m.getParameter( factor ) != NULL );
+}
+END_CONSTRAINT
+
+
+START_CONSTRAINT (20705, Species, s)
+{
+ // level 3
+ pre( s.getLevel() > 2);
+ pre( s.isSetConversionFactor());
+
+ const string& factor = s.getConversionFactor();
+ const Parameter* p = m.getParameter(factor);
+ pre(p != NULL);
+
+ inv( p->getConstant() == true );
+}
+END_CONSTRAINT
+
+
// Parameter validation
START_CONSTRAINT (20701, Parameter, p)
@@ -1377,7 +1631,15 @@
}
END_CONSTRAINT
+START_CONSTRAINT (20702, Parameter, p)
+{
+ pre( p.getLevel() > 2 );
+ inv( p.isSetUnits() );
+}
+END_CONSTRAINT
+
+
// InitialAssignment validation
START_CONSTRAINT (20801, InitialAssignment, ia)
@@ -1391,9 +1653,19 @@
const string& id = ia.getSymbol();
- inv_or( m.getCompartment(id) );
- inv_or( m.getSpecies (id) );
- inv_or( m.getParameter (id) );
+ if (ia.getLevel() == 2)
+ {
+ inv_or( m.getCompartment(id) );
+ inv_or( m.getSpecies (id) );
+ inv_or( m.getParameter (id) );
+ }
+ else
+ {
+ inv_or( m.getCompartment(id) );
+ inv_or( m.getSpecies (id) );
+ inv_or( m.getParameter (id) );
+ inv_or( m.getSpeciesReference (id) );
+ }
}
END_CONSTRAINT
@@ -1401,7 +1673,20 @@
EXTERN_CONSTRAINT(20802, UniqueSymbolsInInitialAssignments)
EXTERN_CONSTRAINT(20803, UniqueVarsInInitialAssignmentsAndRules)
+START_CONSTRAINT (20804, InitialAssignment, ia)
+{
+ //only applies to level 3
+ pre( ia.getLevel() > 2 );
+ // ia must have exactly one math
+ inv( ia.isSetMath() );
+
+}
+END_CONSTRAINT
+
+
+
+
// Assignment and rate Rule validation
START_CONSTRAINT (20901, AssignmentRule, r)
@@ -1449,9 +1734,20 @@
const string& id = r.getVariable();
- inv_or( m.getCompartment(id) );
- inv_or( m.getSpecies (id) );
- inv_or( m.getParameter (id) );
+ if (r.getLevel() < 3)
+ {
+ inv_or( m.getCompartment(id) );
+ inv_or( m.getSpecies (id) );
+ inv_or( m.getParameter (id) );
+ }
+ else
+ {
+ inv_or( m.getCompartment(id) );
+ inv_or( m.getSpecies (id) );
+ inv_or( m.getParameter (id) );
+ inv_or( m.getSpeciesReference (id) );
+
+ }
}
END_CONSTRAINT
@@ -1501,9 +1797,19 @@
const string& id = r.getVariable();
- inv_or( m.getCompartment(id) );
- inv_or( m.getSpecies (id) );
- inv_or( m.getParameter (id) );
+ if (r.getLevel() < 3)
+ {
+ inv_or( m.getCompartment(id) );
+ inv_or( m.getSpecies (id) );
+ inv_or( m.getParameter (id) );
+ }
+ else
+ {
+ inv_or( m.getCompartment(id) );
+ inv_or( m.getSpecies (id) );
+ inv_or( m.getParameter (id) );
+ inv_or( m.getSpeciesReference (id) );
+ }
}
END_CONSTRAINT
@@ -1525,12 +1831,25 @@
const Compartment* c = m.getCompartment(id);
const Species* s = m.getSpecies (id);
const Parameter* p = m.getParameter (id);
+ const SpeciesReference* sr = m.getSpeciesReference(id);
- pre( c || s || p );
+ if (r.getLevel() < 3)
+ {
+ pre( c || s || p );
- inv_or( c && c->getConstant() == false );
- inv_or( s && s->getConstant() == false );
- inv_or( p && p->getConstant() == false );
+ inv_or( c && c->getConstant() == false );
+ inv_or( s && s->getConstant() == false );
+ inv_or( p && p->getConstant() == false );
+ }
+ else
+ {
+ pre( c || s || p || sr);
+
+ inv_or( c && c->getConstant() == false );
+ inv_or( s && s->getConstant() == false );
+ inv_or( p && p->getConstant() == false );
+ inv_or( sr && sr->getConstant() == false );
+ }
}
END_CONSTRAINT
@@ -1552,12 +1871,25 @@
const Compartment* c = m.getCompartment(id);
const Species* s = m.getSpecies (id);
const Parameter* p = m.getParameter (id);
+ const SpeciesReference* sr = m.getSpeciesReference(id);
- pre( c || s || p );
+ if (r.getLevel() < 3)
+ {
+ pre( c || s || p );
- inv_or( c && c->getConstant() == false );
- inv_or( s && s->getConstant() == false );
- inv_or( p && p->getConstant() == false );
+ inv_or( c && c->getConstant() == false );
+ inv_or( s && s->getConstant() == false );
+ inv_or( p && p->getConstant() == false );
+ }
+ else
+ {
+ pre( c || s || p || sr);
+
+ inv_or( c && c->getConstant() == false );
+ inv_or( s && s->getConstant() == false );
+ inv_or( p && p->getConstant() == false );
+ inv_or( sr && sr->getConstant() == false );
+ }
}
END_CONSTRAINT
@@ -1566,7 +1898,44 @@
EXTERN_CONSTRAINT(20906, AssignmentCycles)
EXTERN_CONSTRAINT(99106, AssignmentRuleOrdering)
+START_CONSTRAINT (20907, AssignmentRule, r)
+{
+ //only applies to level 3
+ pre( r.getLevel() > 2 );
+ // r must have exactly one math
+ inv( r.isSetMath() );
+
+}
+END_CONSTRAINT
+
+
+START_CONSTRAINT (20907, RateRule, r)
+{
+ //only applies to level 3
+ pre( r.getLevel() > 2 );
+
+ // r must have exactly one math
+ inv( r.isSetMath() );
+
+}
+END_CONSTRAINT
+
+
+START_CONSTRAINT (20907, AlgebraicRule, r)
+{
+ //only applies to level 3
+ pre( r.getLevel() > 2 );
+
+ // r must have exactly one math
+ inv( r.isSetMath() );
+
+}
+END_CONSTRAINT
+
+
+
+
// Constraint validation
START_CONSTRAINT (21001, Constraint, c)
@@ -1593,6 +1962,20 @@
// 21005: message - no DOCTYPE - caught at read
// 21006: message format - caught at read
+
+START_CONSTRAINT (21007, Constraint, c)
+{
+ //only applies to level 3
+ pre( c.getLevel() > 2 );
+
+ // c must have exactly one math
+ inv( c.isSetMath() );
+
+}
+END_CONSTRAINT
+
+
+
//Reaction validation
START_CONSTRAINT (21101, Reaction, r)
@@ -1614,7 +1997,17 @@
// 21104: listOfReactants/Products must be speciesReference - caught at read
// 21105: listOfModifiers must be ModifierSppeciesreference - caught at read
+START_CONSTRAINT (21107, Reaction, r)
+{
+ pre (r.getLevel() > 2);
+ pre (r.isSetCompartment());
+ inv( m.getCompartment(r.getCompartment()) != NULL );
+}
+END_CONSTRAINT
+
+
+
// SpeciesReference Validation
START_CONSTRAINT (21111, SpeciesReference, sr)
@@ -1645,7 +2038,7 @@
// "Section 4.9.5; L2V2 Section 4.13.3; L2V3 Section 4.13.3.)";
- inv( sr.getStoichiometry() == 1.0 );
+ inv( !sr.isSetStoichiometry() );
}
END_CONSTRAINT
@@ -1716,7 +2109,19 @@
}
END_CONSTRAINT
+START_CONSTRAINT (21130, KineticLaw, kl)
+{
+ //only applies to level 3
+ pre( kl.getLevel() > 2 );
+ // fd must have exactly one math
+ inv( kl.isSetMath() );
+
+}
+END_CONSTRAINT
+
+
+
START_CONSTRAINT (99127, KineticLaw, kl)
{
pre( kl.getLevel() == 1 || (kl.getLevel() == 2 && kl.getVersion() == 1));
@@ -1933,6 +2338,43 @@
}
END_CONSTRAINT
+
+START_CONSTRAINT (21207, Event, e)
+{
+ pre(e.getLevel() == 3);
+ pre(e.isSetDelay());
+
+ inv( e.isSetUseValuesFromTriggerTime() != 0 );
+}
+END_CONSTRAINT
+
+
+
+START_CONSTRAINT (21209, Trigger, t)
+{
+ //only applies to level 3
+ pre( t.getLevel() > 2 );
+
+ // fd must have exactly one math
+ inv( t.isSetMath() );
+
+}
+END_CONSTRAINT
+
+
+START_CONSTRAINT (21210, Delay, d)
+{
+ //only applies to level 3
+ pre( d.getLevel() > 2 );
+
+ // fd must have exactly one math
+ inv( d.isSetMath() );
+
+}
+END_CONSTRAINT
+
+
+
//EventAssignment validation
START_CONSTRAINT (21211, EventAssignment, ea)
@@ -1979,5 +2421,17 @@
}
END_CONSTRAINT
+START_CONSTRAINT (21213, EventAssignment, ea)
+{
+ //only applies to level 3
+ pre( ea.getLevel() > 2 );
+ // fd must have exactly one math
+ inv( ea.isSetMath() );
+}
+END_CONSTRAINT
+
+
+
+
Modified: branches/libsbml-5/src/validator/constraints/L3v1CompatibilityConstraints.cpp
===================================================================
--- branches/libsbml-5/src/validator/constraints/L3v1CompatibilityConstraints.cpp 2010-04-27 18:39:37 UTC (rev 11220)
+++ branches/libsbml-5/src/validator/constraints/L3v1CompatibilityConstraints.cpp 2010-04-27 18:41:52 UTC (rev 11221)
@@ -126,15 +126,4 @@
END_CONSTRAINT
-START_CONSTRAINT (96011, SpeciesReference, sr)
-{
- pre(!sr.isModifier());
- pre( sr.isSetStoichiometryMath() );
-
- inv_or( sr.getStoichiometryMath()->getMath()->isInteger() );
- inv_or( sr.getStoichiometryMath()->getMath()->isRational() );
-}
-END_CONSTRAINT
-
-
Modified: branches/libsbml-5/src/validator/constraints/Makefile
===================================================================
--- branches/libsbml-5/src/validator/constraints/Makefile 2010-04-27 18:39:37 UTC (rev 11220)
+++ branches/libsbml-5/src/validator/constraints/Makefile 2010-04-27 18:41:52 UTC (rev 11221)
@@ -128,6 +128,7 @@
UniqueVarsInInitialAssignmentsAndRules.cpp \
UniqueVarsInRules.cpp \
UnitConsistencyConstraints.cpp \
+ ValidCnUnitsValue.cpp \
UnitsBase.cpp
header_inst_prefix = validator/constraints
@@ -178,7 +179,8 @@
UniqueVarsInEventAssignments.h \
UniqueVarsInEventsAndRules.h \
UniqueVarsInInitialAssignmentsAndRules.h \
- UniqueVarsInRules.h
+ UniqueVarsInRules.h \
+ ValidCnUnitsValue.h
# `distfiles' determines the files and directories included in a distribution.
# `distfiles_exclude' is used to filter out specific items, so that even if
Modified: branches/libsbml-5/src/validator/constraints/Makefile.in
===================================================================
--- branches/libsbml-5/src/validator/constraints/Makefile.in 2010-04-27 18:39:37 UTC (rev 11220)
+++ branches/libsbml-5/src/validator/constraints/Makefile.in 2010-04-27 18:41:52 UTC (rev 11221)
@@ -128,6 +128,7 @@
UniqueVarsInInitialAssignmentsAndRules.cpp \
UniqueVarsInRules.cpp \
UnitConsistencyConstraints.cpp \
+ ValidCnUnitsValue.cpp \
UnitsBase.cpp
header_inst_prefix = validator/constraints
@@ -178,7 +179,8 @@
UniqueVarsInEventAssignments.h \
UniqueVarsInEventsAndRules.h \
UniqueVarsInInitialAssignmentsAndRules.h \
- UniqueVarsInRules.h
+ UniqueVarsInRules.h \
+ ValidCnUnitsValue.h
# `distfiles' determines the files and directories included in a distribution.
# `distfiles_exclude' is used to filter out specific items, so that even if
Modified: branches/libsbml-5/src/validator/constraints/MathMLConsistencyConstraints.cpp
===================================================================
--- branches/libsbml-5/src/validator/constraints/MathMLConsistencyConstraints.cpp 2010-04-27 18:39:37 UTC (rev 11220)
+++ branches/libsbml-5/src/validator/constraints/MathMLConsistencyConstraints.cpp 2010-04-27 18:41:52 UTC (rev 11221)
@@ -39,6 +39,7 @@
#include "LocalParameterMathCheck.h"
#include "NumberArgsMathCheck.h"
#include "FunctionNoArgsMathCheck.h"
+#include "ValidCnUnitsValue.h"
#endif
@@ -81,3 +82,7 @@
EXTERN_CONSTRAINT( 10218, NumberArgsMathCheck )
EXTERN_CONSTRAINT( 10219, FunctionNoArgsMathCheck )
+// 10220: units only on cn - caught at read
+
+EXTERN_CONSTRAINT( 10221, ValidCnUnitsValue)
+
Modified: branches/libsbml-5/src/validator/constraints/OverDeterminedCheck.cpp
===================================================================
--- branches/libsbml-5/src/validator/constraints/OverDeterminedCheck.cpp 2010-04-27 18:39:37 UTC (rev 11220)
+++ branches/libsbml-5/src/validator/constraints/OverDeterminedCheck.cpp 2010-04-27 18:41:52 UTC (rev 11221)
@@ -187,7 +187,7 @@
void
OverDeterminedCheck::writeVariableVertexes(const Model& m)
{
- unsigned int n;
+ unsigned int n, k;
for (n = 0; n < m.getNumCompartments(); n++)
{
@@ -231,6 +231,27 @@
{
mVariables.append(m.getReaction(n)->getId());
}
+ if (m.getLevel() > 2)
+ {
+ /* in L3 stoichiometry could be altered by rules
+ * so these need to be included
+ * where a speciesReference is marked as false
+ */
+ for (k = 0; k < m.getReaction(n)->getNumReactants(); k++)
+ {
+ if (m.getReaction(n)->getReactant(k)->getConstant() == false )
+ {
+ mVariables.append(m.getReaction(n)->getReactant(k)->getId());
+ }
+ }
+ for (k = 0; k < m.getReaction(n)->getNumProducts(); k++)
+ {
+ if (m.getReaction(n)->getProduct(k)->getConstant() == false )
+ {
+ mVariables.append(m.getReaction(n)->getProduct(k)->getId());
+ }
+ }
+ }
}
}
@@ -566,9 +587,16 @@
for (n = 0; n < unmatch.size(); n++)
{
maximal = Recurse(unmatch.at(n));
+ if (maximal == 2) break;
}
}
}
+
+ if (maximal == 2)
+ {
+ // we have a flip flopping set of matches
+ unmatchedEquations.append(mMatching[unmatch.at(n)].at(0));
+ }
return unmatchedEquations;
}
@@ -581,12 +609,15 @@
unsigned int
OverDeterminedCheck::Recurse(std::string v)
{
+ static graph revisited;
+ static IdList visited;
unsigned int rec = 0;
unsigned int n;
IdList tempVarNeigh;
IdList tempEqnNeigh;
IdList L;
IdList pu;
+ IdList prev;
graph::iterator iter;
@@ -621,8 +652,43 @@
if (pu.size() == 1 && !strcmp(pu.at(0).c_str(), "unmatched"))
{
- mMatching[v] = L;
- rec = 1;
+ /* look to see if variable has been here before
+ * in order t catch variables that are flip flopping
+ * between equations
+ */
+ bool repeat = false;
+ if (!visited.contains(v))
+ {
+ visited.append(v);
+ revisited[v] = L;
+ }
+ else
+ {
+ prev = revisited[v];
+ unsigned int i;
+ for (i = 0; i < L.size(); i++)
+ {
+ if (prev.contains(L.at(i)))
+ {
+ repeat = true;
+ }
+ else
+ {
+ prev.append(L.at(i));
+ }
+ if (repeat) break;
+ }
+ }
+ if (!repeat)
+ {
+ mMatching[v] = L;
+ rec = 1;
+ }
+ else
+ {
+ rec = 2;
+ return rec;
+ }
}
else if (Recurse(pu.at(0)))
{
Modified: branches/libsbml-5/src/validator/constraints/PowerUnitsCheck.cpp
===================================================================
--- branches/libsbml-5/src/validator/constraints/PowerUnitsCheck.cpp 2010-04-27 18:39:37 UTC (rev 11220)
+++ branches/libsbml-5/src/validator/constraints/PowerUnitsCheck.cpp 2010-04-27 18:41:52 UTC (rev 11221)
@@ -178,6 +178,7 @@
// if not argument needs to be an integer or a rational
unsigned int isInteger = 0;
unsigned int isRational = 0;
+ unsigned int isExpression = 0;
/* power must be an integer
* but need to check that it is not a real
* number that is integral
@@ -198,8 +199,14 @@
isInteger = 1;
}
}
- else
+ else if (child->getNumChildren() > 0)
+
{
+ // power might itself be an expression - then we cant check
+ isExpression = 1;
+ }
+ else
+ {
// power could be a parameter
const Parameter *param = NULL;
@@ -271,6 +278,10 @@
logRationalPowerConflict(node, sb);
}
+ else if (isExpression == 1)
+ {
+ logExpressionPowerConflict(node, sb);
+ }
else if (isInteger == 0)
{
logNonIntegerPowerConflict(node, sb);
@@ -530,4 +541,26 @@
}
+void
+PowerUnitsCheck::logExpressionPowerConflict (const ASTNode & node,
+ const SBase & sb)
+{
+ char * formula = SBML_formulaToString(&node);
+ msg = "The formula '";
+ msg += formula;
+ msg += "' in the ";
+ msg += getFieldname();
+ msg += " element of the " ;
+ msg += getTypename(sb);
+ msg += " contains an expression for the exponent of the power function ";
+ msg += "and thus cannot be checked for unit validity.";
+
+
+ safe_free(formula);
+
+ logFailure(sb, msg);
+
+}
+
+
LIBSBML_CPP_NAMESPACE_END
Modified: branches/libsbml-5/src/validator/constraints/PowerUnitsCheck.h
===================================================================
--- branches/libsbml-5/src/validator/constraints/PowerUnitsCheck.h 2010-04-27 18:39:37 UTC (rev 11220)
+++ branches/libsbml-5/src/validator/constraints/PowerUnitsCheck.h 2010-04-27 18:41:52 UTC (rev 11221)
@@ -102,6 +102,8 @@
const SBase & sb);
void logRationalPowerConflict (const ASTNode & node,
const SBase & sb);
+ void logExpressionPowerConflict (const ASTNode & node,
+ const SBase & sb);
/* HACK: until I rewrite the unit stuff
* if a mathml has pow(p, 0.5)/ pow (p, 0.5) then its valid
* at moment it will fire this constraint twice
Added: branches/libsbml-5/src/validator/constraints/ValidCnUnitsValue.cpp
===================================================================
--- branches/libsbml-5/src/validator/constraints/ValidCnUnitsValue.cpp (rev 0)
+++ branches/libsbml-5/src/validator/constraints/ValidCnUnitsValue.cpp 2010-04-27 18:41:52 UTC (rev 11221)
@@ -0,0 +1,177 @@
+/**
+ * @file ValidCnUnitsValue.cpp
+ * @brief Ensures units values are valid.
+ * @author Sarah Keating
+ *
+ * $Id: $
+ * $HeadURL: $
+ */
+/* Copyright 2005 California Institute of Technology and Japan Science and
+ * Technology Corporation.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation. A copy of the license agreement is
+ * provided in the file named "LICENSE.txt" included with this software
+ * distribution. It is also available online at
+ * http://sbml.org/software/libsbml/license.html
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+
+#include <sbml/Model.h>
+#include <sbml/Compartment.h>
+#include <sbml/Species.h>
+#include <sbml/Parameter.h>
+#include <sbml/UnitDefinition.h>
+#include <sbml/Event.h>
+#include <sbml/Reaction.h>
+#include <sbml/EventAssignment.h>
+#include <sbml/SpeciesReference.h>
+#include <sbml/Rule.h>
+#include <sbml/math/FormulaFormatter.h>
+
+#include <sbml/units/UnitFormulaFormatter.h>
+
+#include "ValidCnUnitsValue.h"
+
+/** @cond doxygen-ignored */
+
+using namespace std;
+
+/** @endcond doxygen-ignored */
+
+LIBSBML_CPP_NAMESPACE_BEGIN
+
+static const char* PREAMBLE =
+ "The arguments of the MathML logical operators 'and', 'or', 'xor', and "
+ "'not' must have boolean values. (References: L2V2 Section 3.5.8.)";
+
+
+/**
+ * Creates a new Constraint with the given id.
+ */
+ValidCnUnitsValue::ValidCnUnitsValue (unsigned int id, Validator& v) : MathMLBase(id, v)
+{
+}
+
+
+/**
+ * Destroys this Constraint.
+ */
+ValidCnUnitsValue::~ValidCnUnitsValue ()
+{
+}
+
+
+/**
+ * @return the preamble to use when logging constraint violations.
+ */
+const char*
+ValidCnUnitsValue::getPreamble ()
+{
+ return PREAMBLE;
+}
+
+
+/**
+ * Checks the MathML of the ASTnode
+ * is appropriate for the function being performed
+ *
+ * If an inconsistency is found, an error message is logged.
+ */
+void
+ValidCnUnitsValue::checkMath (const Model& m, const ASTNode& node, const SBase & sb)
+{
+
+ if (node.isNumber())
+ {
+ checkValidUnits(m, node, sb);
+ }
+ else
+ {
+ ASTNodeType_t type = node.getType();
+
+ switch (type)
+ {
+ case AST_FUNCTION:
+
+ checkFunction(m, node, sb);
+ break;
+
+ default:
+
+ checkChildren(m, node, sb);
+ break;
+
+ }
+ }
+
+ //switch (type)
+ //{
+ // case AST_LOGICAL_AND:
+ // case AST_LOGICAL_NOT:
+ // case AST_LOGICAL_OR:
+ // case AST_LOGICAL_XOR:
+
+ // checkMathFromLogical(m, node, sb);
+ // break;
+
+
+ // case AST_FUNCTION:
+
+ // checkFunction(m, node, sb);
+ // break;
+
+ // default:
+
+ // checkChildren(m, node, sb);
+ // break;
+
+ //}
+}
+
+
+/**
+ * Checks that the arguments to logical operators are all boolean
+ *
+ * If not, an error message is logged.
+ */
+void
+ValidCnUnitsValue::checkValidUnits (const Model& m, const ASTNode& node,
+ const SBase & sb)
+{
+ std::string units = node.getUnits();
+
+ if (!units.empty())
+ {
+ if (!(Unit::isUnitKind(units, m.getLevel(), m.getVersion()))
+ && (m.getUnitDefinition(units) == NULL))
+ {
+ logMathConflict(node, sb);
+ }
+ }
+}
+
+
+/**
+ * @return the error message to use when logging constraint violations.
+ * This method is called by logFailure.
+ *
+ * Returns a message that the given id and its corresponding object are
+ * in conflict with an object previously defined.
+ */
+const string
+ValidCnUnitsValue::getMessage (const ASTNode& node, const SBase& object)
+{
+
+ ostringstream msg;
+
+
+ return msg.str();
+}
+
+LIBSBML_CPP_NAMESPACE_END
Added: branches/libsbml-5/src/validator/constraints/ValidCnUnitsValue.h
===================================================================
--- branches/libsbml-5/src/validator/constraints/ValidCnUnitsValue.h (rev 0)
+++ branches/libsbml-5/src/validator/constraints/ValidCnUnitsValue.h 2010-04-27 18:41:52 UTC (rev 11221)
@@ -0,0 +1,100 @@
+/**
+ * @file ValidCnUnitsValue.h
+ * @brief Ensures units values are valid.
+ * @author Sarah Keating
+ *
+ * $Id: $
+ * $HeadURL: $
+ */
+/* Copyright 2005 California Institute of Technology and Japan Science and
+ * Technology Corporation.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation. A copy of the license agreement is
+ * provided in the file named "LICENSE.txt" included with this software
+ * distribution. It is also available online at
+ * http://sbml.org/software/libsbml/license.html
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+
+#ifndef ValidCnUnitsValue_h
+#define ValidCnUnitsValue_h
+
+
+#ifdef __cplusplus
+
+
+#include <string>
+#include <sstream>
+#include <math.h>
+
+#include <sbml/validator/VConstraint.h>
+
+#include "MathMLBase.h"
+
+LIBSBML_CPP_NAMESPACE_BEGIN
+
+class ASTNode;
+
+
+class ValidCnUnitsValue: public MathMLBase
+{
+public:
+
+ /**
+ * Creates a new Constraint with the given id.
+ */
+ ValidCnUnitsValue (unsigned int id, Validator& v);
+
+ /**
+ * Destroys this Constraint.
+ */
+ virtual ~ValidCnUnitsValue ();
+
+
+protected:
+
+ /**
+ * Checks the MathML of the ASTnode
+ * is appropriate for the function being performed
+ *
+ * If an inconsistency is found, an error message is logged.
+ */
+ virtual void checkMath (const Model& m, const ASTNode& node, const SBase & sb);
+
+ /**
+ * @return the preamble to use when logging constraint violations. The
+ * preamble will be prepended to each log message. If not overriden,
+ * returns an empty string.
+ */
+ virtual const char* getPreamble ();
+
+ /**
+ * Checks that the arguments to logical operators are all boolean
+ *
+ * If not, an error message is logged.
+ */
+ void checkValidUnits (const Model& m, const ASTNode& node, const SBase & sb);
+
+ /**
+ * @return the error message to use when logging constraint violations.
+ * This method is called by logFailure.
+ *
+ * If at all possible please use getPreamble() and getFieldname() when
+ * constructing error messages. This will help to make your constraint
+ * easily customizable.
+ */
+ virtual const std::string
+ getMessage (const ASTNode& node, const SBase& object);
+
+};
+
+LIBSBML_CPP_NAMESPACE_END
+
+#endif /* __cplusplus */
+#endif /* ValidCnUnitsValue_h */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sar...@us...> - 2010-04-27 18:39:43
|
Revision: 11220
http://sbml.svn.sourceforge.net/sbml/?rev=11220&view=rev
Author: sarahkeating
Date: 2010-04-27 18:39:37 +0000 (Tue, 27 Apr 2010)
Log Message:
-----------
merging changes from 4.1
Modified Paths:
--------------
branches/libsbml-5/src/validator/test/TestConsistencyValidator.cpp
Modified: branches/libsbml-5/src/validator/test/TestConsistencyValidator.cpp
===================================================================
--- branches/libsbml-5/src/validator/test/TestConsistencyValidator.cpp 2010-04-27 18:31:25 UTC (rev 11219)
+++ branches/libsbml-5/src/validator/test/TestConsistencyValidator.cpp 2010-04-27 18:39:37 UTC (rev 11220)
@@ -38,6 +38,7 @@
#include "L2v2CompatibilityValidator.h"
#include "L2v3CompatibilityValidator.h"
#include "L2v4CompatibilityValidator.h"
+#include "L3v1CompatibilityValidator.h"
#include <sbml/validator/ModelingPracticeValidator.h>
#include <sbml/SBase.h>
@@ -242,6 +243,22 @@
* TestFile, false otherwise.
*/
bool
+runL3v1Test (const TestFile& file)
+{
+ L3v1CompatibilityValidator validator;
+ TestValidator tester(validator);
+
+
+ validator.init();
+
+ return tester.test(file);
+}
+
+/**
+ * @return true if the Validator behaved as expected when validating
+ * TestFile, false otherwise.
+ */
+bool
runTestBadXML (const TestFile& file)
{
ConsistencyValidator validator;
@@ -391,9 +408,6 @@
failed += runTests( "Testing Model Consistency Constraints (20000 - 29999)",
"test-data", 20000, 29999, runMainTest, library);
- //failed += runTests( "Testing Unit Consistency Constraints L2V4 (90500 - 90599)",
- // "test-data", 90500, 90599, runUnitTest, library);
-
failed += runTests( "Testing L1 Compatibility Constraints (91000 - 91999)",
"test-data-conversion", 91000, 91999, runL1Test, library);
@@ -406,9 +420,12 @@
failed += runTests("Testing L2v3 Compatibility Constraints (94000 - 94999)",
"test-data-conversion", 94000, 94999, runL2v3Test, library);
- failed += runTests("Testing L2v3 Compatibility Constraints (94000 - 94999)",
+ failed += runTests("Testing L2v4 Compatibility Constraints (95000 - 95999)",
"test-data-conversion", 95000, 95999, runL2v4Test, library);
+ failed += runTests( "Testing L3v1 Compatibility Constraints (96000 - 96999)",
+ "test-data-conversion", 96000, 96999, runL3v1Test, library);
+
failed += runTests("Testing Additional SBML Constraints (99100 - 99199)",
"test-data", 99100, 99199, runAdditionalSBMLTest, library);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sar...@us...> - 2010-04-27 18:31:32
|
Revision: 11219
http://sbml.svn.sourceforge.net/sbml/?rev=11219&view=rev
Author: sarahkeating
Date: 2010-04-27 18:31:25 +0000 (Tue, 27 Apr 2010)
Log Message:
-----------
merging changes from 4.1
Removed Paths:
-------------
branches/libsbml-5/src/validator/test/test-data-conversion/96011-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data-conversion/96011-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data-conversion/96011-fail-01-03.xml
branches/libsbml-5/src/validator/test/test-data-conversion/96011-fail-01-04.xml
Deleted: branches/libsbml-5/src/validator/test/test-data-conversion/96011-fail-01-01.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data-conversion/96011-fail-01-01.xml 2010-04-27 18:23:30 UTC (rev 11218)
+++ branches/libsbml-5/src/validator/test/test-data-conversion/96011-fail-01-01.xml 2010-04-27 18:31:25 UTC (rev 11219)
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sbml xmlns="http://www.sbml.org/sbml/level2" level="2" version="1">
- <model>
- <listOfCompartments>
- <compartment id="c"/>
- </listOfCompartments>
- <listOfSpecies>
- <species id="s" compartment="c"/>
- </listOfSpecies>
- <listOfReactions>
- <reaction id="r">
- <listOfReactants>
- <speciesReference species="s">
- <stoichiometryMath>
- <math xmlns="http://www.w3.org/1998/Math/MathML">
- <apply>
- <sin/>
- <cn> 2 </cn>
- </apply>
- </math>
- </stoichiometryMath>
- </speciesReference>
- </listOfReactants>
- </reaction>
- </listOfReactions>
- </model>
-</sbml>
Deleted: branches/libsbml-5/src/validator/test/test-data-conversion/96011-fail-01-02.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data-conversion/96011-fail-01-02.xml 2010-04-27 18:23:30 UTC (rev 11218)
+++ branches/libsbml-5/src/validator/test/test-data-conversion/96011-fail-01-02.xml 2010-04-27 18:31:25 UTC (rev 11219)
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sbml xmlns="http://www.sbml.org/sbml/level2/version2" level="2" version="2">
- <model>
- <listOfCompartments>
- <compartment id="c"/>
- </listOfCompartments>
- <listOfSpecies>
- <species id="s" compartment="c"/>
- </listOfSpecies>
- <listOfReactions>
- <reaction id="r">
- <listOfReactants>
- <speciesReference species="s">
- <stoichiometryMath>
- <math xmlns="http://www.w3.org/1998/Math/MathML">
- <apply>
- <sin/>
- <cn> 2 </cn>
- </apply>
- </math>
- </stoichiometryMath>
- </speciesReference>
- </listOfReactants>
- </reaction>
- </listOfReactions>
- </model>
-</sbml>
Deleted: branches/libsbml-5/src/validator/test/test-data-conversion/96011-fail-01-03.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data-conversion/96011-fail-01-03.xml 2010-04-27 18:23:30 UTC (rev 11218)
+++ branches/libsbml-5/src/validator/test/test-data-conversion/96011-fail-01-03.xml 2010-04-27 18:31:25 UTC (rev 11219)
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sbml xmlns="http://www.sbml.org/sbml/level2/version3" level="2" version="3">
- <model>
- <listOfCompartments>
- <compartment id="c"/>
- </listOfCompartments>
- <listOfSpecies>
- <species id="s" compartment="c"/>
- </listOfSpecies>
- <listOfReactions>
- <reaction id="r">
- <listOfReactants>
- <speciesReference species="s">
- <stoichiometryMath>
- <math xmlns="http://www.w3.org/1998/Math/MathML">
- <apply>
- <sin/>
- <cn> 2 </cn>
- </apply>
- </math>
- </stoichiometryMath>
- </speciesReference>
- </listOfReactants>
- </reaction>
- </listOfReactions>
- </model>
-</sbml>
Deleted: branches/libsbml-5/src/validator/test/test-data-conversion/96011-fail-01-04.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data-conversion/96011-fail-01-04.xml 2010-04-27 18:23:30 UTC (rev 11218)
+++ branches/libsbml-5/src/validator/test/test-data-conversion/96011-fail-01-04.xml 2010-04-27 18:31:25 UTC (rev 11219)
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sbml xmlns="http://www.sbml.org/sbml/level2/version4" level="2" version="4">
- <model>
- <listOfCompartments>
- <compartment id="c"/>
- </listOfCompartments>
- <listOfSpecies>
- <species id="s" compartment="c"/>
- </listOfSpecies>
- <listOfReactions>
- <reaction id="r">
- <listOfReactants>
- <speciesReference species="s">
- <stoichiometryMath>
- <math xmlns="http://www.w3.org/1998/Math/MathML">
- <apply>
- <sin/>
- <cn> 2 </cn>
- </apply>
- </math>
- </stoichiometryMath>
- </speciesReference>
- </listOfReactants>
- </reaction>
- </listOfReactions>
- </model>
-</sbml>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sar...@us...> - 2010-04-27 18:23:45
|
Revision: 11218
http://sbml.svn.sourceforge.net/sbml/?rev=11218&view=rev
Author: sarahkeating
Date: 2010-04-27 18:23:30 +0000 (Tue, 27 Apr 2010)
Log Message:
-----------
merging changes from 4.1
Added Paths:
-----------
branches/libsbml-5/src/validator/test/test-data/10215-pass-00-06.xml
branches/libsbml-5/src/validator/test/test-data/10216-fail-01-05.xml
branches/libsbml-5/src/validator/test/test-data/10216-pass-00-05.xml
branches/libsbml-5/src/validator/test/test-data/10217-fail-01-05.xml
branches/libsbml-5/src/validator/test/test-data/10217-pass-00-05.xml
branches/libsbml-5/src/validator/test/test-data/10218-fail-01-09.xml
branches/libsbml-5/src/validator/test/test-data/10218-pass-00-09.xml
branches/libsbml-5/src/validator/test/test-data/10219-fail-01-05.xml
branches/libsbml-5/src/validator/test/test-data/10219-fail-01-06.xml
branches/libsbml-5/src/validator/test/test-data/10219-fail-01-07.xml
branches/libsbml-5/src/validator/test/test-data/10219-fail-01-08.xml
branches/libsbml-5/src/validator/test/test-data/10219-pass-00-05.xml
branches/libsbml-5/src/validator/test/test-data/10220-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/10220-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/10220-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/10221-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/10221-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/10221-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/10221-pass-00-02.xml
branches/libsbml-5/src/validator/test/test-data/10221-pass-00-03.xml
branches/libsbml-5/src/validator/test/test-data/10301-fail-01-11.xml
branches/libsbml-5/src/validator/test/test-data/10301-pass-00-07.xml
branches/libsbml-5/src/validator/test/test-data/10302-fail-01-07.xml
branches/libsbml-5/src/validator/test/test-data/10302-pass-00-13.xml
branches/libsbml-5/src/validator/test/test-data/10303-fail-01-07.xml
branches/libsbml-5/src/validator/test/test-data/10303-pass-00-07.xml
branches/libsbml-5/src/validator/test/test-data/10304-fail-01-08.xml
branches/libsbml-5/src/validator/test/test-data/10304-pass-00-07.xml
branches/libsbml-5/src/validator/test/test-data/10305-fail-01-05.xml
branches/libsbml-5/src/validator/test/test-data/10305-pass-00-09.xml
branches/libsbml-5/src/validator/test/test-data/10305-pass-00-10.xml
branches/libsbml-5/src/validator/test/test-data/10306-fail-01-05.xml
branches/libsbml-5/src/validator/test/test-data/10306-pass-00-05.xml
branches/libsbml-5/src/validator/test/test-data/10307-fail-01-26.xml
branches/libsbml-5/src/validator/test/test-data/10307-fail-01-27.xml
branches/libsbml-5/src/validator/test/test-data/10307-fail-01-28.xml
branches/libsbml-5/src/validator/test/test-data/10307-fail-01-29.xml
branches/libsbml-5/src/validator/test/test-data/10307-fail-01-30.xml
branches/libsbml-5/src/validator/test/test-data/10307-fail-01-31.xml
branches/libsbml-5/src/validator/test/test-data/10307-fail-01-32.xml
branches/libsbml-5/src/validator/test/test-data/10307-fail-01-33.xml
branches/libsbml-5/src/validator/test/test-data/10307-fail-01-34.xml
branches/libsbml-5/src/validator/test/test-data/10307-fail-01-35.xml
branches/libsbml-5/src/validator/test/test-data/10307-fail-01-36.xml
branches/libsbml-5/src/validator/test/test-data/10307-fail-01-37.xml
branches/libsbml-5/src/validator/test/test-data/10307-fail-01-38.xml
branches/libsbml-5/src/validator/test/test-data/10307-fail-01-39.xml
branches/libsbml-5/src/validator/test/test-data/10307-fail-01-40.xml
branches/libsbml-5/src/validator/test/test-data/10307-fail-01-41.xml
branches/libsbml-5/src/validator/test/test-data/10307-fail-01-42.xml
branches/libsbml-5/src/validator/test/test-data/10307-fail-01-43.xml
branches/libsbml-5/src/validator/test/test-data/10307-fail-01-44.xml
branches/libsbml-5/src/validator/test/test-data/10307-pass-00-05.xml
branches/libsbml-5/src/validator/test/test-data/10308-fail-01-13.xml
branches/libsbml-5/src/validator/test/test-data/10308-fail-01-14.xml
branches/libsbml-5/src/validator/test/test-data/10308-fail-01-15.xml
branches/libsbml-5/src/validator/test/test-data/10308-fail-01-16.xml
branches/libsbml-5/src/validator/test/test-data/10308-pass-00-07.xml
branches/libsbml-5/src/validator/test/test-data/10308-pass-00-08.xml
branches/libsbml-5/src/validator/test/test-data/10309-fail-01-25.xml
branches/libsbml-5/src/validator/test/test-data/10309-fail-01-26.xml
branches/libsbml-5/src/validator/test/test-data/10309-fail-01-27.xml
branches/libsbml-5/src/validator/test/test-data/10309-fail-01-28.xml
branches/libsbml-5/src/validator/test/test-data/10309-fail-01-29.xml
branches/libsbml-5/src/validator/test/test-data/10309-fail-01-30.xml
branches/libsbml-5/src/validator/test/test-data/10309-pass-00-46.xml
branches/libsbml-5/src/validator/test/test-data/10309-pass-00-47.xml
branches/libsbml-5/src/validator/test/test-data/10309-pass-00-48.xml
branches/libsbml-5/src/validator/test/test-data/10309-pass-00-49.xml
branches/libsbml-5/src/validator/test/test-data/10309-pass-00-50.xml
branches/libsbml-5/src/validator/test/test-data/10309-pass-00-51.xml
branches/libsbml-5/src/validator/test/test-data/10309-pass-00-52.xml
branches/libsbml-5/src/validator/test/test-data/10309-pass-00-53.xml
branches/libsbml-5/src/validator/test/test-data/10309-pass-00-54.xml
branches/libsbml-5/src/validator/test/test-data/10309-pass-00-55.xml
branches/libsbml-5/src/validator/test/test-data/10309-pass-00-56.xml
branches/libsbml-5/src/validator/test/test-data/10310-fail-01-13.xml
branches/libsbml-5/src/validator/test/test-data/10310-fail-01-14.xml
branches/libsbml-5/src/validator/test/test-data/10310-pass-00-10.xml
branches/libsbml-5/src/validator/test/test-data/10310-pass-00-11.xml
branches/libsbml-5/src/validator/test/test-data/10311-fail-01-19.xml
branches/libsbml-5/src/validator/test/test-data/10311-fail-01-20.xml
branches/libsbml-5/src/validator/test/test-data/10311-fail-01-21.xml
branches/libsbml-5/src/validator/test/test-data/10311-fail-01-22.xml
branches/libsbml-5/src/validator/test/test-data/10311-pass-00-16.xml
branches/libsbml-5/src/validator/test/test-data/10311-pass-00-17.xml
branches/libsbml-5/src/validator/test/test-data/10311-pass-00-18.xml
branches/libsbml-5/src/validator/test/test-data/10311-pass-00-19.xml
branches/libsbml-5/src/validator/test/test-data/10401-fail-01-05.xml
branches/libsbml-5/src/validator/test/test-data/10401-fail-01-06.xml
branches/libsbml-5/src/validator/test/test-data/10402-fail-01-07.xml
branches/libsbml-5/src/validator/test/test-data/10402-fail-01-08.xml
branches/libsbml-5/src/validator/test/test-data/10403-pass-00-04.xml
branches/libsbml-5/src/validator/test/test-data/10404-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/10404-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/10404-fail-01-03.xml
branches/libsbml-5/src/validator/test/test-data/10404-fail-01-04.xml.xml
branches/libsbml-5/src/validator/test/test-data/10601-fail-01-07.xml
branches/libsbml-5/src/validator/test/test-data/10601-fail-01-08.xml
branches/libsbml-5/src/validator/test/test-data/10601-pass-00-13.xml
branches/libsbml-5/src/validator/test/test-data/10601-pass-00-14.xml
branches/libsbml-5/src/validator/test/test-data/10601-pass-00-16.xml
branches/libsbml-5/src/validator/test/test-data/10701-fail-01-04.xml
branches/libsbml-5/src/validator/test/test-data/10701-pass-00-04.xml
branches/libsbml-5/src/validator/test/test-data/10702-fail-01-04.xml
branches/libsbml-5/src/validator/test/test-data/10702-pass-00-04.xml
branches/libsbml-5/src/validator/test/test-data/10703-fail-01-04.xml
branches/libsbml-5/src/validator/test/test-data/10703-pass-00-04.xml
branches/libsbml-5/src/validator/test/test-data/10704-fail-01-04.xml
branches/libsbml-5/src/validator/test/test-data/10704-pass-00-04.xml
branches/libsbml-5/src/validator/test/test-data/10705-fail-01-04.xml
branches/libsbml-5/src/validator/test/test-data/10705-pass-00-04.xml
branches/libsbml-5/src/validator/test/test-data/10706-fail-01-04.xml
branches/libsbml-5/src/validator/test/test-data/10706-pass-00-04.xml
branches/libsbml-5/src/validator/test/test-data/10707-fail-01-04.xml
branches/libsbml-5/src/validator/test/test-data/10707-pass-00-04.xml
branches/libsbml-5/src/validator/test/test-data/10708-fail-01-07.xml
branches/libsbml-5/src/validator/test/test-data/10708-fail-01-08.xml
branches/libsbml-5/src/validator/test/test-data/10708-pass-00-07.xml
branches/libsbml-5/src/validator/test/test-data/10708-pass-00-08.xml
branches/libsbml-5/src/validator/test/test-data/10709-fail-01-09.xml
branches/libsbml-5/src/validator/test/test-data/10709-pass-00-09.xml
branches/libsbml-5/src/validator/test/test-data/10710-fail-01-04.xml
branches/libsbml-5/src/validator/test/test-data/10710-pass-00-04.xml
branches/libsbml-5/src/validator/test/test-data/10711-fail-01-04.xml
branches/libsbml-5/src/validator/test/test-data/10711-pass-00-04.xml
branches/libsbml-5/src/validator/test/test-data/10712-fail-01-03.xml
branches/libsbml-5/src/validator/test/test-data/10712-pass-00-03.xml
branches/libsbml-5/src/validator/test/test-data/10713-fail-01-03.xml
branches/libsbml-5/src/validator/test/test-data/10713-pass-00-03.xml
branches/libsbml-5/src/validator/test/test-data/10716-fail-01-03.xml
branches/libsbml-5/src/validator/test/test-data/10716-pass-00-03.xml
branches/libsbml-5/src/validator/test/test-data/10717-fail-01-03.xml
branches/libsbml-5/src/validator/test/test-data/10717-pass-00-03.xml
branches/libsbml-5/src/validator/test/test-data/10801-fail-01-10.xml
branches/libsbml-5/src/validator/test/test-data/10801-fail-01-11.xml
branches/libsbml-5/src/validator/test/test-data/10801-fail-01-12.xml
branches/libsbml-5/src/validator/test/test-data/10801-pass-00-13.xml
branches/libsbml-5/src/validator/test/test-data/10801-pass-00-14.xml
branches/libsbml-5/src/validator/test/test-data/10802-pass-00-04.xml
branches/libsbml-5/src/validator/test/test-data/10803-pass-00-04.xml
branches/libsbml-5/src/validator/test/test-data/10804-pass-00-10.xml
branches/libsbml-5/src/validator/test/test-data/10804-pass-00-11.xml
branches/libsbml-5/src/validator/test/test-data/10804-pass-00-12.xml
branches/libsbml-5/src/validator/test/test-data/10804-pass-00-13.xml
branches/libsbml-5/src/validator/test/test-data/10804-pass-00-14.xml
branches/libsbml-5/src/validator/test/test-data/10804-pass-00-15.xml
branches/libsbml-5/src/validator/test/test-data/10805-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20101-fail-01-04.xml
branches/libsbml-5/src/validator/test/test-data/20101-pass-00-08.xml
branches/libsbml-5/src/validator/test/test-data/20102-fail-01-05.xml
branches/libsbml-5/src/validator/test/test-data/20102-fail-01-06.xml
branches/libsbml-5/src/validator/test/test-data/20102-pass-00-06.xml
branches/libsbml-5/src/validator/test/test-data/20103-fail-01-07-99101.xml
branches/libsbml-5/src/validator/test/test-data/20103-fail-01-08-99101.xml
branches/libsbml-5/src/validator/test/test-data/20103-pass-00-06.xml
branches/libsbml-5/src/validator/test/test-data/20108-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20108-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20201-fail-01-07.xml
branches/libsbml-5/src/validator/test/test-data/20201-pass-00-07.xml
branches/libsbml-5/src/validator/test/test-data/20202-pass-00-07.xml
branches/libsbml-5/src/validator/test/test-data/20202-pass-00-08.xml
branches/libsbml-5/src/validator/test/test-data/20203-fail-01-11.xml
branches/libsbml-5/src/validator/test/test-data/20204-pass-00-05.xml
branches/libsbml-5/src/validator/test/test-data/20205-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20205-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/20205-fail-01-03.xml
branches/libsbml-5/src/validator/test/test-data/20205-fail-01-04.xml
branches/libsbml-5/src/validator/test/test-data/20205-fail-01-05.xml
branches/libsbml-5/src/validator/test/test-data/20205-fail-01-06.xml
branches/libsbml-5/src/validator/test/test-data/20205-fail-01-07.xml
branches/libsbml-5/src/validator/test/test-data/20205-fail-01-08.xml
branches/libsbml-5/src/validator/test/test-data/20205-fail-01-09.xml
branches/libsbml-5/src/validator/test/test-data/20205-fail-01-10.xml
branches/libsbml-5/src/validator/test/test-data/20205-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20206-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20207-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20208-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20209-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20210-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20211-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20212-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20213-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20214-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20215-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20216-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20216-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20217-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20217-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/20217-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20217-pass-00-02.xml
branches/libsbml-5/src/validator/test/test-data/20217-pass-00-03.xml
branches/libsbml-5/src/validator/test/test-data/20217-pass-00-04.xml
branches/libsbml-5/src/validator/test/test-data/20218-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20218-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/20218-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20218-pass-00-02.xml
branches/libsbml-5/src/validator/test/test-data/20218-pass-00-03.xml
branches/libsbml-5/src/validator/test/test-data/20218-pass-00-04.xml
branches/libsbml-5/src/validator/test/test-data/20218-pass-00-05.xml
branches/libsbml-5/src/validator/test/test-data/20219-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20219-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/20219-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20219-pass-00-02.xml
branches/libsbml-5/src/validator/test/test-data/20219-pass-00-03.xml
branches/libsbml-5/src/validator/test/test-data/20220-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20220-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/20220-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20220-pass-00-02.xml
branches/libsbml-5/src/validator/test/test-data/20220-pass-00-03.xml
branches/libsbml-5/src/validator/test/test-data/20220-pass-00-04.xml
branches/libsbml-5/src/validator/test/test-data/20221-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20221-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/20221-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20221-pass-00-02.xml
branches/libsbml-5/src/validator/test/test-data/20221-pass-00-03.xml
branches/libsbml-5/src/validator/test/test-data/20221-pass-00-04.xml
branches/libsbml-5/src/validator/test/test-data/20221-pass-00-05.xml
branches/libsbml-5/src/validator/test/test-data/20221-pass-00-06.xml
branches/libsbml-5/src/validator/test/test-data/20221-pass-00-07.xml
branches/libsbml-5/src/validator/test/test-data/20221-pass-00-08.xml
branches/libsbml-5/src/validator/test/test-data/20221-pass-00-09.xml
branches/libsbml-5/src/validator/test/test-data/20221-pass-00-10.xml
branches/libsbml-5/src/validator/test/test-data/20221-pass-00-11.xml
branches/libsbml-5/src/validator/test/test-data/20221-pass-00-12.xml
branches/libsbml-5/src/validator/test/test-data/20222-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20222-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20223-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20223-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20224-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20224-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20225-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20225-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20226-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20226-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20227-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20227-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20228-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20228-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20229-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20229-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20230-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20230-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20231-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20231-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20232-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20232-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20301-fail-01-08.xml
branches/libsbml-5/src/validator/test/test-data/20301-fail-01-09.xml
branches/libsbml-5/src/validator/test/test-data/20301-pass-00-07.xml
branches/libsbml-5/src/validator/test/test-data/20301-pass-00-08.xml
branches/libsbml-5/src/validator/test/test-data/20302-pass-00-12.xml
branches/libsbml-5/src/validator/test/test-data/20302-pass-00-13.xml
branches/libsbml-5/src/validator/test/test-data/20302-pass-00-14.xml
branches/libsbml-5/src/validator/test/test-data/20302-pass-00-15.xml
branches/libsbml-5/src/validator/test/test-data/20303-fail-01-07.xml
branches/libsbml-5/src/validator/test/test-data/20303-fail-01-08.xml
branches/libsbml-5/src/validator/test/test-data/20303-pass-00-07.xml
branches/libsbml-5/src/validator/test/test-data/20303-pass-00-08.xml
branches/libsbml-5/src/validator/test/test-data/20304-fail-01-13.xml
branches/libsbml-5/src/validator/test/test-data/20304-fail-01-14.xml
branches/libsbml-5/src/validator/test/test-data/20304-fail-02-15.xml
branches/libsbml-5/src/validator/test/test-data/20304-fail-02-16.xml
branches/libsbml-5/src/validator/test/test-data/20304-pass-00-11.xml
branches/libsbml-5/src/validator/test/test-data/20304-pass-00-12.xml
branches/libsbml-5/src/validator/test/test-data/20304-pass-00-13.xml
branches/libsbml-5/src/validator/test/test-data/20304-pass-00-14.xml
branches/libsbml-5/src/validator/test/test-data/20305-fail-01-08.xml
branches/libsbml-5/src/validator/test/test-data/20305-pass-00-23.xml
branches/libsbml-5/src/validator/test/test-data/20305-pass-00-24.xml
branches/libsbml-5/src/validator/test/test-data/20305-pass-00-25.xml
branches/libsbml-5/src/validator/test/test-data/20305-pass-00-26.xml
branches/libsbml-5/src/validator/test/test-data/20305-pass-00-27.xml
branches/libsbml-5/src/validator/test/test-data/20305-pass-00-28.xml
branches/libsbml-5/src/validator/test/test-data/20305-pass-00-29.xml
branches/libsbml-5/src/validator/test/test-data/20306-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20306-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/20306-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20307-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20307-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/20307-fail-01-03.xml
branches/libsbml-5/src/validator/test/test-data/20307-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20401-fail-01-07.xml
branches/libsbml-5/src/validator/test/test-data/20401-fail-01-08.xml
branches/libsbml-5/src/validator/test/test-data/20401-pass-00-13.xml
branches/libsbml-5/src/validator/test/test-data/20401-pass-00-14.xml
branches/libsbml-5/src/validator/test/test-data/20401-pass-00-15.xml
branches/libsbml-5/src/validator/test/test-data/20410-fail-01-17.xml
branches/libsbml-5/src/validator/test/test-data/20410-fail-01-18.xml
branches/libsbml-5/src/validator/test/test-data/20410-fail-01-19.xml
branches/libsbml-5/src/validator/test/test-data/20410-fail-01-20.xml
branches/libsbml-5/src/validator/test/test-data/20410-pass-00-07.xml
branches/libsbml-5/src/validator/test/test-data/20410-pass-00-08.xml
branches/libsbml-5/src/validator/test/test-data/20413-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20413-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20413-pass-00-02.xml
branches/libsbml-5/src/validator/test/test-data/20414-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20415-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20419-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20419-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/20419-fail-01-03.xml
branches/libsbml-5/src/validator/test/test-data/20419-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20419-pass-00-02.xml
branches/libsbml-5/src/validator/test/test-data/20420-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20420-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20421-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20421-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/20421-fail-01-03.xml
branches/libsbml-5/src/validator/test/test-data/20421-fail-01-04-20410.xml
branches/libsbml-5/src/validator/test/test-data/20421-fail-01-05.xml
branches/libsbml-5/src/validator/test/test-data/20421-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20421-pass-00-02.xml
branches/libsbml-5/src/validator/test/test-data/20507-fail-01-09.xml
branches/libsbml-5/src/validator/test/test-data/20507-fail-01-10.xml
branches/libsbml-5/src/validator/test/test-data/20507-pass-00-19.xml
branches/libsbml-5/src/validator/test/test-data/20507-pass-00-20.xml
branches/libsbml-5/src/validator/test/test-data/20507-pass-00-21.xml
branches/libsbml-5/src/validator/test/test-data/20507-pass-00-22.xml
branches/libsbml-5/src/validator/test/test-data/20507-pass-00-23.xml
branches/libsbml-5/src/validator/test/test-data/20508-fail-01-09.xml
branches/libsbml-5/src/validator/test/test-data/20508-fail-01-10.xml
branches/libsbml-5/src/validator/test/test-data/20508-pass-00-15.xml
branches/libsbml-5/src/validator/test/test-data/20508-pass-00-16.xml
branches/libsbml-5/src/validator/test/test-data/20508-pass-00-17.xml
branches/libsbml-5/src/validator/test/test-data/20508-pass-00-18.xml
branches/libsbml-5/src/validator/test/test-data/20509-fail-01-11.xml
branches/libsbml-5/src/validator/test/test-data/20509-fail-01-12.xml
branches/libsbml-5/src/validator/test/test-data/20509-pass-00-32.xml
branches/libsbml-5/src/validator/test/test-data/20509-pass-00-33.xml
branches/libsbml-5/src/validator/test/test-data/20509-pass-00-34.xml
branches/libsbml-5/src/validator/test/test-data/20509-pass-00-35.xml
branches/libsbml-5/src/validator/test/test-data/20509-pass-00-36.xml
branches/libsbml-5/src/validator/test/test-data/20509-pass-00-37.xml
branches/libsbml-5/src/validator/test/test-data/20511-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20511-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20511-pass-00-02.xml
branches/libsbml-5/src/validator/test/test-data/20512-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20512-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20512-pass-00-02.xml
branches/libsbml-5/src/validator/test/test-data/20513-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20513-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20513-pass-00-02.xml
branches/libsbml-5/src/validator/test/test-data/20517-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20517-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/20517-fail-01-03.xml
branches/libsbml-5/src/validator/test/test-data/20517-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20517-pass-00-02.xml
branches/libsbml-5/src/validator/test/test-data/20601-fail-01-06-0.xml
branches/libsbml-5/src/validator/test/test-data/20601-pass-00-06-1.xml
branches/libsbml-5/src/validator/test/test-data/20608-fail-01-15.xml
branches/libsbml-5/src/validator/test/test-data/20608-fail-01-16.xml
branches/libsbml-5/src/validator/test/test-data/20608-fail-01-17.xml
branches/libsbml-5/src/validator/test/test-data/20608-pass-00-31.xml
branches/libsbml-5/src/validator/test/test-data/20608-pass-00-32.xml
branches/libsbml-5/src/validator/test/test-data/20608-pass-00-33.xml
branches/libsbml-5/src/validator/test/test-data/20608-pass-00-34.xml
branches/libsbml-5/src/validator/test/test-data/20608-pass-00-35.xml
branches/libsbml-5/src/validator/test/test-data/20608-pass-00-36.xml
branches/libsbml-5/src/validator/test/test-data/20608-pass-00-37.xml
branches/libsbml-5/src/validator/test/test-data/20608-pass-00-38.xml
branches/libsbml-5/src/validator/test/test-data/20608-pass-00-39.xml
branches/libsbml-5/src/validator/test/test-data/20609-fail-01-05.xml
branches/libsbml-5/src/validator/test/test-data/20609-pass-00-09.xml
branches/libsbml-5/src/validator/test/test-data/20609-pass-00-10.xml
branches/libsbml-5/src/validator/test/test-data/20610-fail-01-13.xml
branches/libsbml-5/src/validator/test/test-data/20610-fail-01-14.xml
branches/libsbml-5/src/validator/test/test-data/20610-pass-00-13.xml
branches/libsbml-5/src/validator/test/test-data/20610-pass-00-14.xml
branches/libsbml-5/src/validator/test/test-data/20611-fail-01-13.xml
branches/libsbml-5/src/validator/test/test-data/20611-fail-01-14.xml
branches/libsbml-5/src/validator/test/test-data/20611-fail-01-15.xml
branches/libsbml-5/src/validator/test/test-data/20611-pass-00-13.xml
branches/libsbml-5/src/validator/test/test-data/20611-pass-00-14.xml
branches/libsbml-5/src/validator/test/test-data/20611-pass-00-15.xml
branches/libsbml-5/src/validator/test/test-data/20614-fail-01-04.xml
branches/libsbml-5/src/validator/test/test-data/20614-pass-00-07.xml
branches/libsbml-5/src/validator/test/test-data/20616-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20616-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20616-pass-00-02.xml
branches/libsbml-5/src/validator/test/test-data/20617-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20617-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20623-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20623-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/20623-fail-01-03.xml
branches/libsbml-5/src/validator/test/test-data/20623-fail-01-04.xml
branches/libsbml-5/src/validator/test/test-data/20623-fail-01-05.xml
branches/libsbml-5/src/validator/test/test-data/20623-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20623-pass-00-02.xml
branches/libsbml-5/src/validator/test/test-data/20701-fail-01-09.xml
branches/libsbml-5/src/validator/test/test-data/20701-pass-00-19.xml
branches/libsbml-5/src/validator/test/test-data/20701-pass-00-20.xml
branches/libsbml-5/src/validator/test/test-data/20701-pass-00-21.xml
branches/libsbml-5/src/validator/test/test-data/20702-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20702-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20705-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20705-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/20705-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20705-pass-00-02.xml
branches/libsbml-5/src/validator/test/test-data/20706-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20706-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/20706-fail-01-03.xml
branches/libsbml-5/src/validator/test/test-data/20706-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20801-fail-01-04.xml
branches/libsbml-5/src/validator/test/test-data/20801-pass-00-10.xml
branches/libsbml-5/src/validator/test/test-data/20801-pass-00-11.xml
branches/libsbml-5/src/validator/test/test-data/20801-pass-00-12.xml
branches/libsbml-5/src/validator/test/test-data/20801-pass-00-13.xml
branches/libsbml-5/src/validator/test/test-data/20802-fail-01-04.xml
branches/libsbml-5/src/validator/test/test-data/20802-pass-00-04.xml
branches/libsbml-5/src/validator/test/test-data/20803-fail-01-04.xml
branches/libsbml-5/src/validator/test/test-data/20803-pass-00-04.xml
branches/libsbml-5/src/validator/test/test-data/20804-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20804-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/20804-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20805-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20805-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/20805-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20901-fail-01-11.xml
branches/libsbml-5/src/validator/test/test-data/20901-pass-00-19.xml
branches/libsbml-5/src/validator/test/test-data/20901-pass-00-20.xml
branches/libsbml-5/src/validator/test/test-data/20901-pass-00-21.xml
branches/libsbml-5/src/validator/test/test-data/20901-pass-00-22.xml
branches/libsbml-5/src/validator/test/test-data/20901-pass-00-23.xml
branches/libsbml-5/src/validator/test/test-data/20902-fail-01-11.xml
branches/libsbml-5/src/validator/test/test-data/20902-pass-00-19.xml
branches/libsbml-5/src/validator/test/test-data/20902-pass-00-20.xml
branches/libsbml-5/src/validator/test/test-data/20902-pass-00-21.xml
branches/libsbml-5/src/validator/test/test-data/20902-pass-00-22.xml
branches/libsbml-5/src/validator/test/test-data/20902-pass-00-23.xml
branches/libsbml-5/src/validator/test/test-data/20903-fail-01-13.xml
branches/libsbml-5/src/validator/test/test-data/20903-fail-01-14.xml
branches/libsbml-5/src/validator/test/test-data/20903-fail-01-15.xml
branches/libsbml-5/src/validator/test/test-data/20903-fail-01-16.xml
branches/libsbml-5/src/validator/test/test-data/20903-fail-01-17.xml
branches/libsbml-5/src/validator/test/test-data/20903-pass-00-13.xml
branches/libsbml-5/src/validator/test/test-data/20903-pass-00-14.xml
branches/libsbml-5/src/validator/test/test-data/20903-pass-00-15.xml
branches/libsbml-5/src/validator/test/test-data/20903-pass-00-16.xml
branches/libsbml-5/src/validator/test/test-data/20903-pass-00-17.xml
branches/libsbml-5/src/validator/test/test-data/20904-fail-01-13.xml
branches/libsbml-5/src/validator/test/test-data/20904-fail-01-14.xml
branches/libsbml-5/src/validator/test/test-data/20904-fail-01-15.xml
branches/libsbml-5/src/validator/test/test-data/20904-fail-01-16.xml
branches/libsbml-5/src/validator/test/test-data/20904-fail-01-17.xml
branches/libsbml-5/src/validator/test/test-data/20904-pass-00-13.xml
branches/libsbml-5/src/validator/test/test-data/20904-pass-00-14.xml
branches/libsbml-5/src/validator/test/test-data/20904-pass-00-15.xml
branches/libsbml-5/src/validator/test/test-data/20904-pass-00-16.xml
branches/libsbml-5/src/validator/test/test-data/20904-pass-00-17.xml
branches/libsbml-5/src/validator/test/test-data/20906-fail-01-41.xml
branches/libsbml-5/src/validator/test/test-data/20906-fail-01-42.xml
branches/libsbml-5/src/validator/test/test-data/20906-fail-01-43.xml
branches/libsbml-5/src/validator/test/test-data/20906-fail-01-44.xml
branches/libsbml-5/src/validator/test/test-data/20906-fail-01-45.xml
branches/libsbml-5/src/validator/test/test-data/20906-fail-01-46.xml
branches/libsbml-5/src/validator/test/test-data/20906-fail-01-47.xml
branches/libsbml-5/src/validator/test/test-data/20906-fail-01-48.xml
branches/libsbml-5/src/validator/test/test-data/20906-fail-01-49.xml
branches/libsbml-5/src/validator/test/test-data/20906-fail-01-50.xml
branches/libsbml-5/src/validator/test/test-data/20906-fail-03-39.xml
branches/libsbml-5/src/validator/test/test-data/20906-fail-03-40.xml
branches/libsbml-5/src/validator/test/test-data/20906-pass-00-13.xml
branches/libsbml-5/src/validator/test/test-data/20906-pass-00-14.xml
branches/libsbml-5/src/validator/test/test-data/20906-pass-00-15.xml
branches/libsbml-5/src/validator/test/test-data/20907-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20907-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/20907-fail-01-03.xml
branches/libsbml-5/src/validator/test/test-data/20907-fail-01-04.xml
branches/libsbml-5/src/validator/test/test-data/20907-fail-01-05.xml
branches/libsbml-5/src/validator/test/test-data/20907-fail-01-06.xml
branches/libsbml-5/src/validator/test/test-data/20907-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20907-pass-00-02.xml
branches/libsbml-5/src/validator/test/test-data/20907-pass-00-03.xml
branches/libsbml-5/src/validator/test/test-data/20908-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20908-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/20908-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20909-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20909-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/20909-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20910-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20910-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/21001-fail-01-04.xml
branches/libsbml-5/src/validator/test/test-data/21001-pass-00-04.xml
branches/libsbml-5/src/validator/test/test-data/21004-pass-00-04.xml
branches/libsbml-5/src/validator/test/test-data/21005-pass-00-04.xml
branches/libsbml-5/src/validator/test/test-data/21007-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/21007-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/21007-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/21008-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/21008-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/21009-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/21009-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/21101-fail-01-11.xml
branches/libsbml-5/src/validator/test/test-data/21101-fail-01-12.xml
branches/libsbml-5/src/validator/test/test-data/21101-pass-00-25.xml
branches/libsbml-5/src/validator/test/test-data/21101-pass-00-26.xml
branches/libsbml-5/src/validator/test/test-data/21101-pass-00-27.xml
branches/libsbml-5/src/validator/test/test-data/21101-pass-00-28.xml
branches/libsbml-5/src/validator/test/test-data/21103-fail-01-19.xml
branches/libsbml-5/src/validator/test/test-data/21103-fail-01-20.xml
branches/libsbml-5/src/validator/test/test-data/21103-fail-02-21.xml
branches/libsbml-5/src/validator/test/test-data/21103-pass-00-07.xml
branches/libsbml-5/src/validator/test/test-data/21104-fail-01-13.xml
branches/libsbml-5/src/validator/test/test-data/21104-fail-01-14.xml
branches/libsbml-5/src/validator/test/test-data/21104-pass-00-07.xml
branches/libsbml-5/src/validator/test/test-data/21105-fail-01-05.xml
branches/libsbml-5/src/validator/test/test-data/21105-pass-00-05.xml
branches/libsbml-5/src/validator/test/test-data/21106-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/21106-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/21106-fail-01-03.xml
branches/libsbml-5/src/validator/test/test-data/21106-fail-01-04.xml
branches/libsbml-5/src/validator/test/test-data/21106-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/21107-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/21107-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/21110-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/21110-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/21110-fail-01-03.xml
branches/libsbml-5/src/validator/test/test-data/21110-fail-01-04.xml
branches/libsbml-5/src/validator/test/test-data/21110-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/21111-fail-01-17.xml
branches/libsbml-5/src/validator/test/test-data/21111-fail-01-18.xml
branches/libsbml-5/src/validator/test/test-data/21111-fail-01-19.xml
branches/libsbml-5/src/validator/test/test-data/21111-pass-00-17.xml
branches/libsbml-5/src/validator/test/test-data/21111-pass-00-18.xml
branches/libsbml-5/src/validator/test/test-data/21111-pass-00-19.xml
branches/libsbml-5/src/validator/test/test-data/21116-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/21116-fail-01-02-21111.xml
branches/libsbml-5/src/validator/test/test-data/21116-fail-01-03.xml
branches/libsbml-5/src/validator/test/test-data/21116-fail-01-04-21111.xml
branches/libsbml-5/src/validator/test/test-data/21116-fail-01-05.xml
branches/libsbml-5/src/validator/test/test-data/21116-fail-01-06.xml
branches/libsbml-5/src/validator/test/test-data/21116-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/21116-pass-00-02.xml
branches/libsbml-5/src/validator/test/test-data/21117-fail-01-01-21111.xml
branches/libsbml-5/src/validator/test/test-data/21117-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/21117-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/21121-fail-01-07.xml
branches/libsbml-5/src/validator/test/test-data/21121-pass-00-07.xml
branches/libsbml-5/src/validator/test/test-data/21123-fail-01-07.xml
branches/libsbml-5/src/validator/test/test-data/21123-pass-00-07.xml
branches/libsbml-5/src/validator/test/test-data/21127-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/21127-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/21127-pass-00-02.xml
branches/libsbml-5/src/validator/test/test-data/21128-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/21128-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/21129-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/21129-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/21130-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/21130-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/21130-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/21132-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/21132-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/21150-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/21150-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/21150-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/21150-pass-00-02.xml
branches/libsbml-5/src/validator/test/test-data/21151-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/21151-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/21172-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/21172-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/21172-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/21201-fail-01-04.xml
branches/libsbml-5/src/validator/test/test-data/21201-fail-01-05.xml
branches/libsbml-5/src/validator/test/test-data/21201-pass-00-05.xml
branches/libsbml-5/src/validator/test/test-data/21202-fail-01-13.xml
branches/libsbml-5/src/validator/test/test-data/21202-fail-01-14.xml
branches/libsbml-5/src/validator/test/test-data/21202-fail-01-15.xml
branches/libsbml-5/src/validator/test/test-data/21202-pass-00-13.xml
branches/libsbml-5/src/validator/test/test-data/21202-pass-00-14.xml
branches/libsbml-5/src/validator/test/test-data/21202-pass-00-15.xml
branches/libsbml-5/src/validator/test/test-data/21203-fail-01-05.xml
branches/libsbml-5/src/validator/test/test-data/21203-pass-00-05.xml
branches/libsbml-5/src/validator/test/test-data/21206-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/21206-pass-00-03.xml
branches/libsbml-5/src/validator/test/test-data/21206-pass-00-04.xml
branches/libsbml-5/src/validator/test/test-data/21207-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/21207-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/21209-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/21209-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/21209-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/21210-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/21210-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/21210-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/21211-fail-01-05.xml
branches/libsbml-5/src/validator/test/test-data/21211-pass-00-13.xml
branches/libsbml-5/src/validator/test/test-data/21211-pass-00-14.xml
branches/libsbml-5/src/validator/test/test-data/21211-pass-00-15.xml
branches/libsbml-5/src/validator/test/test-data/21212-fail-01-13.xml
branches/libsbml-5/src/validator/test/test-data/21212-fail-01-14.xml
branches/libsbml-5/src/validator/test/test-data/21212-fail-01-15.xml
branches/libsbml-5/src/validator/test/test-data/21212-pass-00-13.xml
branches/libsbml-5/src/validator/test/test-data/21212-pass-00-14.xml
branches/libsbml-5/src/validator/test/test-data/21212-pass-00-15.xml
branches/libsbml-5/src/validator/test/test-data/21213-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/21213-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/21213-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/21214-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/21214-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/21214-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/21221-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/21221-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/21222-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/21222-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/21223-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/21223-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/21224-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/21224-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/21225-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/21225-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/21226-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/21226-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/21227-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/21227-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/99104-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/99104-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/99104-fail-01-03.xml
branches/libsbml-5/src/validator/test/test-data/99104-fail-01-04.xml
branches/libsbml-5/src/validator/test/test-data/99104-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/99104-pass-00-02.xml
Removed Paths:
-------------
branches/libsbml-5/src/validator/test/test-data/20104-fail-01-01.xml
branches/libsbml-5/src/validator/test/test-data/20104-fail-01-02.xml
branches/libsbml-5/src/validator/test/test-data/20104-fail-01-03.xml
branches/libsbml-5/src/validator/test/test-data/20104-fail-01-04.xml
branches/libsbml-5/src/validator/test/test-data/20104-pass-00-01.xml
branches/libsbml-5/src/validator/test/test-data/20104-pass-00-02.xml
Added: branches/libsbml-5/src/validator/test/test-data/10215-pass-00-06.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10215-pass-00-06.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10215-pass-00-06.xml 2010-04-27 18:23:30 UTC (rev 11218)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" units="litre" constant="false"/>
+ </listOfCompartments>
+ <listOfSpecies>
+ <species id="s1" compartment="c" hasOnlySubstanceUnits="true" boundaryCondition="false" constant="false"/>
+ <species id="s2" compartment="c" hasOnlySubstanceUnits="true" boundaryCondition="false" constant="false"/>
+ </listOfSpecies>
+ <listOfReactions>
+ <reaction id="R" reversible="false" fast="false">
+ <listOfReactants>
+ <speciesReference species="s1" constant="true"/>
+ </listOfReactants>
+ <listOfProducts>
+ <speciesReference species="s2" constant="true"/>
+ </listOfProducts>
+ <kineticLaw>
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <divide/>
+ <ci> s1 </ci>
+ <ci> k_1 </ci>
+ </apply>
+ </math>
+ <listOfLocalParameters>
+ <localParameter id="k_1" value="1" units="second"/>
+ </listOfLocalParameters>
+ </kineticLaw>
+ </reaction>
+ </listOfReactions>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10216-fail-01-05.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10216-fail-01-05.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10216-fail-01-05.xml 2010-04-27 18:23:30 UTC (rev 11218)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" units="litre" constant="false"/>
+ </listOfCompartments>
+ <listOfSpecies>
+ <species id="s" compartment="c" hasOnlySubstanceUnits="true" boundaryCondition="false" constant="false"/>
+ <species id="e" compartment="c" hasOnlySubstanceUnits="true" boundaryCondition="false" constant="false"/>
+ <species id="p" compartment="c" hasOnlySubstanceUnits="true" boundaryCondition="false" constant="false"/>
+ </listOfSpecies>
+ <listOfParameters>
+ <parameter id="p1" constant="false"/>
+ </listOfParameters>
+ <listOfRules>
+ <assignmentRule variable="p1">
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <divide/>
+ <ci> p </ci>
+ <ci> k </ci>
+ </apply>
+ </math>
+ </assignmentRule>
+ </listOfRules>
+ <listOfReactions>
+ <reaction id="r" reversible="true" fast="false">
+ <listOfReactants>
+ <speciesReference species="s" constant="true"/>
+ </listOfReactants>
+ <listOfProducts>
+ <speciesReference species="p" constant="true"/>
+ </listOfProducts>
+ <listOfModifiers>
+ <modifierSpeciesReference species="e"/>
+ </listOfModifiers>
+ <kineticLaw>
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <divide/>
+ <ci> s </ci>
+ <ci> k </ci>
+ </apply>
+ </math>
+ <listOfLocalParameters>
+ <localParameter id="k" value="1" units="second"/>
+ </listOfLocalParameters>
+ </kineticLaw>
+ </reaction>
+ </listOfReactions>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10216-pass-00-05.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10216-pass-00-05.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10216-pass-00-05.xml 2010-04-27 18:23:30 UTC (rev 11218)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" units="litre" constant="false"/>
+ </listOfCompartments>
+ <listOfSpecies>
+ <species id="s" compartment="c" hasOnlySubstanceUnits="true" boundaryCondition="false" constant="false"/>
+ <species id="e" compartment="c" hasOnlySubstanceUnits="true" boundaryCondition="false" constant="false"/>
+ <species id="p" compartment="c" hasOnlySubstanceUnits="true" boundaryCondition="false" constant="false"/>
+ </listOfSpecies>
+ <listOfParameters>
+ <parameter id="p1" constant="false"/>
+ </listOfParameters>
+ <listOfRules>
+ <assignmentRule variable="p1">
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <divide/>
+ <ci> p </ci>
+ <ci> e </ci>
+ </apply>
+ </math>
+ </assignmentRule>
+ </listOfRules>
+ <listOfReactions>
+ <reaction id="r" reversible="true" fast="false">
+ <listOfReactants>
+ <speciesReference species="s" constant="true"/>
+ </listOfReactants>
+ <listOfProducts>
+ <speciesReference species="p" constant="true"/>
+ </listOfProducts>
+ <listOfModifiers>
+ <modifierSpeciesReference species="e"/>
+ </listOfModifiers>
+ <kineticLaw>
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <divide/>
+ <ci> s </ci>
+ <ci> k </ci>
+ </apply>
+ </math>
+ <listOfLocalParameters>
+ <localParameter id="k" value="1" units="second"/>
+ </listOfLocalParameters>
+ </kineticLaw>
+ </reaction>
+ </listOfReactions>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10217-fail-01-05.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10217-fail-01-05.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10217-fail-01-05.xml 2010-04-27 18:23:30 UTC (rev 11218)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfParameters>
+ <parameter id="y" constant="false"/>
+ <parameter id="q" constant="true"/>
+ <parameter id="z" constant="false"/>
+ <parameter id="p" constant="false"/>
+ </listOfParameters>
+ <listOfInitialAssignments>
+ <initialAssignment symbol="z">
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <neq/>
+ <apply>
+ <gt/>
+ <ci> z </ci>
+ <cn type="integer"> 6 </cn>
+ </apply>
+ <true/>
+ </apply>
+ </math>
+ </initialAssignment>
+ </listOfInitialAssignments>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10217-pass-00-05.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10217-pass-00-05.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10217-pass-00-05.xml 2010-04-27 18:23:30 UTC (rev 11218)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfParameters>
+ <parameter id="y" constant="false"/>
+ <parameter id="q" constant="true"/>
+ <parameter id="z" constant="false"/>
+ <parameter id="p" constant="false"/>
+ </listOfParameters>
+ <listOfInitialAssignments>
+ <initialAssignment symbol="z">
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <plus/>
+ <ci> z </ci>
+ <cn type="integer"> 6 </cn>
+ </apply>
+ </math>
+ </initialAssignment>
+ </listOfInitialAssignments>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10218-fail-01-09.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10218-fail-01-09.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10218-fail-01-09.xml 2010-04-27 18:23:30 UTC (rev 11218)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfParameters>
+ <parameter id="p" value="1" constant="false"/>
+ </listOfParameters>
+ <listOfRules>
+ <assignmentRule variable="p">
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <times/>
+ <cn> 5.5 </cn>
+ </apply>
+ </math>
+ </assignmentRule>
+ </listOfRules>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10218-pass-00-09.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10218-pass-00-09.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10218-pass-00-09.xml 2010-04-27 18:23:30 UTC (rev 11218)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfParameters>
+ <parameter id="p" value="1" constant="false"/>
+ </listOfParameters>
+ <listOfRules>
+ <assignmentRule variable="p">
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <root/>
+ <degree>
+ <cn type="integer"> 2 </cn>
+ </degree>
+ <cn> 5.5 </cn>
+ </apply>
+ </math>
+ </assignmentRule>
+ </listOfRules>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10219-fail-01-05.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10219-fail-01-05.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10219-fail-01-05.xml 2010-04-27 18:23:30 UTC (rev 11218)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfFunctionDefinitions>
+ <functionDefinition id="pow3">
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <lambda>
+ <bvar>
+ <ci> x </ci>
+ </bvar>
+ <apply>
+ <power/>
+ <ci> x </ci>
+ <cn> 3 </cn>
+ </apply>
+ </lambda>
+ </math>
+ </functionDefinition>
+ </listOfFunctionDefinitions>
+ <listOfParameters>
+ <parameter id="p" constant="false"/>
+ </listOfParameters>
+ <listOfRules>
+ <assignmentRule variable="p">
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <ci> pow3</ci>
+ <cn> 5.5 </cn>
+ <cn> 3 </cn>
+ <cn> 6 </cn>
+ </apply>
+ </math>
+ </assignmentRule>
+ </listOfRules>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10219-fail-01-06.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10219-fail-01-06.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10219-fail-01-06.xml 2010-04-27 18:23:30 UTC (rev 11218)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfFunctionDefinitions>
+ <functionDefinition id="pow3">
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <lambda>
+ <bvar>
+ <ci> x </ci>
+ </bvar>
+ <apply>
+ <power/>
+ <ci> x </ci>
+ <cn> 3 </cn>
+ </apply>
+ </lambda>
+ </math>
+ </functionDefinition>
+ </listOfFunctionDefinitions>
+ <listOfParameters>
+ <parameter id="p" constant="false"/>
+ </listOfParameters>
+ <listOfRules>
+ <assignmentRule variable="p">
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <ci> pow3</ci>
+ <cn> 5.5 </cn>
+ <cn> 3 </cn>
+ </apply>
+ </math>
+ </assignmentRule>
+ </listOfRules>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10219-fail-01-07.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10219-fail-01-07.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10219-fail-01-07.xml 2010-04-27 18:23:30 UTC (rev 11218)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfFunctionDefinitions>
+ <functionDefinition id="pow3">
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <lambda>
+ <bvar>
+ <ci> x </ci>
+ </bvar>
+ <apply>
+ <power/>
+ <ci> x </ci>
+ <cn> 3 </cn>
+ </apply>
+ </lambda>
+ </math>
+ </functionDefinition>
+ </listOfFunctionDefinitions>
+ <listOfParameters>
+ <parameter id="p" constant="false"/>
+ </listOfParameters>
+ <listOfRules>
+ <assignmentRule variable="p">
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <ci> pow3</ci>
+ </apply>
+ </math>
+ </assignmentRule>
+ </listOfRules>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10219-fail-01-08.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10219-fail-01-08.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10219-fail-01-08.xml 2010-04-27 18:23:30 UTC (rev 11218)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfFunctionDefinitions>
+ <functionDefinition id="pow3">
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <lambda>
+ <bvar><ci> x </ci></bvar>
+ <bvar><ci> y</ci></bvar>
+ <apply>
+ <power/>
+ <ci> x </ci>
+ <ci> y </ci>
+ </apply>
+ </lambda>
+ </math>
+ </functionDef...
[truncated message content] |
|
From: <sar...@us...> - 2010-04-27 18:13:35
|
Revision: 11217
http://sbml.svn.sourceforge.net/sbml/?rev=11217&view=rev
Author: sarahkeating
Date: 2010-04-27 18:13:29 +0000 (Tue, 27 Apr 2010)
Log Message:
-----------
Modified Paths:
--------------
branches/libsbml-5/src/validator/test/test-data/10210-fail-01-07-10217.xml
Added Paths:
-----------
branches/libsbml-5/src/validator/test/test-data/10207-fail-01-05.xml
branches/libsbml-5/src/validator/test/test-data/10207-pass-00-17.xml
branches/libsbml-5/src/validator/test/test-data/10207-pass-00-18.xml
branches/libsbml-5/src/validator/test/test-data/10208-fail-01-05.xml
branches/libsbml-5/src/validator/test/test-data/10208-pass-00-12.xml
branches/libsbml-5/src/validator/test/test-data/10208-pass-00-13.xml
branches/libsbml-5/src/validator/test/test-data/10209-fail-01-12.xml
branches/libsbml-5/src/validator/test/test-data/10209-fail-01-13.xml
branches/libsbml-5/src/validator/test/test-data/10209-fail-02-14.xml
branches/libsbml-5/src/validator/test/test-data/10209-pass-00-04.xml
branches/libsbml-5/src/validator/test/test-data/10210-fail-01-08-10217.xml
branches/libsbml-5/src/validator/test/test-data/10210-pass-00-10.xml
branches/libsbml-5/src/validator/test/test-data/10211-fail-01-06.xml
branches/libsbml-5/src/validator/test/test-data/10211-pass-00-06.xml
branches/libsbml-5/src/validator/test/test-data/10212-fail-01-11.xml
branches/libsbml-5/src/validator/test/test-data/10212-fail-01-12.xml
branches/libsbml-5/src/validator/test/test-data/10212-fail-01-13.xml
branches/libsbml-5/src/validator/test/test-data/10212-fail-02-14.xml
branches/libsbml-5/src/validator/test/test-data/10212-pass-00-07.xml
branches/libsbml-5/src/validator/test/test-data/10212-pass-00-08.xml
branches/libsbml-5/src/validator/test/test-data/10213-fail-01-11.xml
branches/libsbml-5/src/validator/test/test-data/10213-pass-00-09.xml
branches/libsbml-5/src/validator/test/test-data/10214-fail-01-05.xml
branches/libsbml-5/src/validator/test/test-data/10214-pass-00-05.xml
branches/libsbml-5/src/validator/test/test-data/10215-fail-01-05.xml
Added: branches/libsbml-5/src/validator/test/test-data/10207-fail-01-05.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10207-fail-01-05.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10207-fail-01-05.xml 2010-04-27 18:13:29 UTC (rev 11217)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfConstraints>
+ <constraint>
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <gt/>
+ <cn type="complex-cartesian"> 12.3 <sep/> 5 </cn>
+ <cn> 5 </cn>
+ </apply>
+ </math>
+ </constraint>
+ </listOfConstraints>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10207-pass-00-17.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10207-pass-00-17.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10207-pass-00-17.xml 2010-04-27 18:13:29 UTC (rev 11217)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" constant="false"/>
+ </listOfCompartments>
+ <listOfParameters>
+ <parameter id="p" value="1" constant="false"/>
+ <parameter id="p1" value="1" units="metre" constant="false"/>
+ <parameter id="delta_t" value="1" units="second" constant="false"/>
+ </listOfParameters>
+ <listOfRules>
+ <assignmentRule variable="p">
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <times/>
+ <cn type="integer"> 12 </cn>
+ <cn type="integer"> 5 </cn>
+ </apply>
+ </math>
+ </assignmentRule>
+ </listOfRules>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10207-pass-00-18.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10207-pass-00-18.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10207-pass-00-18.xml 2010-04-27 18:13:29 UTC (rev 11217)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" constant="false"/>
+ </listOfCompartments>
+ <listOfParameters>
+ <parameter id="p" value="1" constant="false"/>
+ <parameter id="p1" value="1" units="metre" constant="false"/>
+ <parameter id="delta_t" value="1" units="second" constant="false"/>
+ </listOfParameters>
+ <listOfRules>
+ <assignmentRule variable="p">
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <times/>
+ <cn type="e-notation"> 1.23 <sep/> 6 </cn>
+ <cn type="integer"> 5 </cn>
+ </apply>
+ </math>
+ </assignmentRule>
+ </listOfRules>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10208-fail-01-05.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10208-fail-01-05.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10208-fail-01-05.xml 2010-04-27 18:13:29 UTC (rev 11217)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="cell" size="0.013" constant="true"/>
+ </listOfCompartments>
+ <listOfSpecies>
+ <species id="X0" compartment="cell" hasOnlySubstanceUnits="false" boundaryCondition="false" constant="false"/>
+ </listOfSpecies>
+ <listOfParameters>
+ <parameter id="z" constant="true"/>
+ </listOfParameters>
+ <listOfInitialAssignments>
+ <initialAssignment symbol="z">
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <lambda>
+ <bvar>
+ <ci> z </ci>
+ </bvar>
+ <bvar>
+ <ci> cell </ci>
+ </bvar>
+ <apply>
+ <plus/>
+ <ci> z </ci>
+ <ci> cell </ci>
+ </apply>
+ </lambda>
+ </math>
+ </initialAssignment>
+ </listOfInitialAssignments>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10208-pass-00-12.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10208-pass-00-12.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10208-pass-00-12.xml 2010-04-27 18:13:29 UTC (rev 11217)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="cell" size="0.013" constant="true"/>
+ </listOfCompartments>
+ <listOfSpecies>
+ <species id="X0" compartment="cell" hasOnlySubstanceUnits="false" boundaryCondition="false" constant="false"/>
+ </listOfSpecies>
+ <listOfParameters>
+ <parameter id="z" constant="true"/>
+ </listOfParameters>
+ <listOfInitialAssignments>
+ <initialAssignment symbol="z">
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <plus/>
+ <ci> z </ci>
+ <ci> cell </ci>
+ </apply>
+ </math>
+ </initialAssignment>
+ </listOfInitialAssignments>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10208-pass-00-13.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10208-pass-00-13.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10208-pass-00-13.xml 2010-04-27 18:13:29 UTC (rev 11217)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfFunctionDefinitions>
+ <functionDefinition id="y">
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <lambda>
+ <bvar>
+ <ci> x </ci>
+ </bvar>
+ <apply>
+ <power/>
+ <ci> x </ci>
+ <cn type="integer"> 3 </cn>
+ </apply>
+ </lambda>
+ </math>
+ </functionDefinition>
+ </listOfFunctionDefinitions>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10209-fail-01-12.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10209-fail-01-12.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10209-fail-01-12.xml 2010-04-27 18:13:29 UTC (rev 11217)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="cell" size="0.013" constant="true"/>
+ </listOfCompartments>
+ <listOfSpecies>
+ <species id="X0" compartment="cell" hasOnlySubstanceUnits="false" boundaryCondition="false" constant="false"/>
+ </listOfSpecies>
+ <listOfConstraints>
+ <constraint>
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <not/>
+ <cn type="integer"> 1 </cn>
+ </apply>
+ </math>
+ </constraint>
+ </listOfConstraints>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10209-fail-01-13.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10209-fail-01-13.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10209-fail-01-13.xml 2010-04-27 18:13:29 UTC (rev 11217)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfFunctionDefinitions>
+ <functionDefinition id="fpow">
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <lambda>
+ <bvar>
+ <ci> x </ci>
+ </bvar>
+ <bvar>
+ <ci> y </ci>
+ </bvar>
+ <apply>
+ <and/>
+ <ci> x </ci>
+ <ci> y </ci>
+ </apply>
+ </lambda>
+ </math>
+ </functionDefinition>
+ </listOfFunctionDefinitions>
+ <listOfCompartments>
+ <compartment id="cell" size="0.013" constant="true"/>
+ </listOfCompartments>
+ <listOfSpecies>
+ <species id="X0" compartment="cell" hasOnlySubstanceUnits="false" boundaryCondition="false" constant="false"/>
+ </listOfSpecies>
+ <listOfParameters>
+ <parameter id="z" constant="true"/>
+ </listOfParameters>
+ <listOfConstraints>
+ <constraint>
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <ci> fpow </ci>
+ <true/>
+ <ci> cell </ci>
+ </apply>
+ </math>
+ </constraint>
+ </listOfConstraints>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10209-fail-02-14.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10209-fail-02-14.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10209-fail-02-14.xml 2010-04-27 18:13:29 UTC (rev 11217)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="cell" size="0.013" constant="true"/>
+ </listOfCompartments>
+ <listOfSpecies>
+ <species id="X0" compartment="cell" hasOnlySubstanceUnits="false" boundaryCondition="false" constant="false"/>
+ </listOfSpecies>
+ <listOfConstraints>
+ <constraint>
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <and/>
+ <cn type="integer"> 1 </cn>
+ <ci> cell </ci>
+ </apply>
+ </math>
+ </constraint>
+ </listOfConstraints>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10209-pass-00-04.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10209-pass-00-04.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10209-pass-00-04.xml 2010-04-27 18:13:29 UTC (rev 11217)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="cell" size="0.013" constant="true"/>
+ </listOfCompartments>
+ <listOfSpecies>
+ <species id="X0" compartment="cell" hasOnlySubstanceUnits="false" boundaryCondition="false" constant="false"/>
+ </listOfSpecies>
+ <listOfConstraints>
+ <constraint>
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <not/>
+ <apply>
+ <gt/>
+ <cn type="integer"> 2 </cn>
+ <cn type="integer"> 3 </cn>
+ </apply>
+ </apply>
+ </math>
+ </constraint>
+ </listOfConstraints>
+ </model>
+</sbml>
Modified: branches/libsbml-5/src/validator/test/test-data/10210-fail-01-07-10217.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10210-fail-01-07-10217.xml 2010-04-27 18:11:57 UTC (rev 11216)
+++ branches/libsbml-5/src/validator/test/test-data/10210-fail-01-07-10217.xml 2010-04-27 18:13:29 UTC (rev 11217)
@@ -9,7 +9,7 @@
</listOfSpecies>
<listOfParameters>
<parameter id="y" constant="false"/>
- <parameter id="q"/>
+ <parameter id="q" constant="true"/>
<parameter id="z" constant="false"/>
<parameter id="p" constant="false"/>
</listOfParameters>
Added: branches/libsbml-5/src/validator/test/test-data/10210-fail-01-08-10217.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10210-fail-01-08-10217.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10210-fail-01-08-10217.xml 2010-04-27 18:13:29 UTC (rev 11217)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" constant="false"/>
+ </listOfCompartments>
+ <listOfSpecies>
+ <species id="s" compartment="c" hasOnlySubstanceUnits="false" boundaryCondition="false" constant="false"/>
+ </listOfSpecies>
+ <listOfParameters>
+ <parameter id="y" constant="false"/>
+ <parameter id="q" constant="true"/>
+ <parameter id="z" constant="false"/>
+ <parameter id="p" constant="false"/>
+ </listOfParameters>
+ <listOfInitialAssignments>
+ <initialAssignment symbol="z">
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <plus/>
+ <apply>
+ <gt/>
+ <ci> y </ci>
+ <ci> z </ci>
+ </apply>
+ <ci> y </ci>
+ </apply>
+ </math>
+ </initialAssignment>
+ </listOfInitialAssignments>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10210-pass-00-10.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10210-pass-00-10.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10210-pass-00-10.xml 2010-04-27 18:13:29 UTC (rev 11217)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" constant="false"/>
+ </listOfCompartments>
+ <listOfSpecies>
+ <species id="s" compartment="c" hasOnlySubstanceUnits="false" boundaryCondition="false" constant="false"/>
+ </listOfSpecies>
+ <listOfParameters>
+ <parameter id="y" constant="false"/>
+ <parameter id="q" constant="true"/>
+ <parameter id="z" constant="false"/>
+ <parameter id="p" constant="false"/>
+ </listOfParameters>
+ <listOfInitialAssignments>
+ <initialAssignment symbol="z">
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <plus/>
+ <ci> y </ci>
+ <ci> q </ci>
+ </apply>
+ </math>
+ </initialAssignment>
+ </listOfInitialAssignments>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10211-fail-01-06.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10211-fail-01-06.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10211-fail-01-06.xml 2010-04-27 18:13:29 UTC (rev 11217)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" constant="false"/>
+ </listOfCompartments>
+ <listOfSpecies>
+ <species id="s" compartment="c" boundaryCondition="false" hasOnlySubstanceUnits="false" constant="false"/>
+ </listOfSpecies>
+ <listOfParameters>
+ <parameter id="y" constant="false"/>
+ <parameter id="q" constant="true"/>
+ <parameter id="z" constant="false"/>
+ <parameter id="p" constant="false"/>
+ </listOfParameters>
+ <listOfConstraints>
+ <constraint>
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <neq/>
+ <apply>
+ <gt/>
+ <cn type="integer"> 3 </cn>
+ <cn type="integer"> 6 </cn>
+ </apply>
+ <ci> z </ci>
+ </apply>
+ </math>
+ </constraint>
+ </listOfConstraints>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10211-pass-00-06.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10211-pass-00-06.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10211-pass-00-06.xml 2010-04-27 18:13:29 UTC (rev 11217)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" constant="false"/>
+ </listOfCompartments>
+ <listOfSpecies>
+ <species id="s" compartment="c" boundaryCondition="false" hasOnlySubstanceUnits="false" constant="false"/>
+ </listOfSpecies>
+ <listOfParameters>
+ <parameter id="y" constant="false"/>
+ <parameter id="q" constant="true"/>
+ <parameter id="z" constant="false"/>
+ <parameter id="p" constant="false"/>
+ </listOfParameters>
+ <listOfConstraints>
+ <constraint>
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <neq/>
+ <apply>
+ <gt/>
+ <cn type="integer"> 3 </cn>
+ <cn type="integer"> 6 </cn>
+ </apply>
+ <true/>
+ </apply>
+ </math>
+ </constraint>
+ </listOfConstraints>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10212-fail-01-11.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10212-fail-01-11.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10212-fail-01-11.xml 2010-04-27 18:13:29 UTC (rev 11217)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" constant="false"/>
+ </listOfCompartments>
+ <listOfParameters>
+ <parameter id="p" value="1" constant="false"/>
+ <parameter id="p1" value="1" units="metre" constant="false"/>
+ </listOfParameters>
+ <listOfRules>
+ <algebraicRule>
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <piecewise>
+ <piece>
+ <apply>
+ <times/>
+ <ci> p </ci>
+ <cn type="integer"> 6 </cn>
+ </apply>
+ <apply>
+ <gt/>
+ <ci> c </ci>
+ <cn type="integer"> 4 </cn>
+ </apply>
+ </piece>
+ <otherwise>
+ <apply>
+ <gt/>
+ <ci> p1 </ci>
+ <cn> 3.5 </cn>
+ </apply>
+ </otherwise>
+ </piecewise>
+ </math>
+ </algebraicRule>
+ </listOfRules>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10212-fail-01-12.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10212-fail-01-12.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10212-fail-01-12.xml 2010-04-27 18:13:29 UTC (rev 11217)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" constant="false"/>
+ </listOfCompartments>
+ <listOfParameters>
+ <parameter id="p" value="1" constant="false"/>
+ <parameter id="p1" value="1" units="metre" constant="false"/>
+ </listOfParameters>
+ <listOfConstraints>
+ <constraint>
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <piecewise>
+ <piece>
+ <apply>
+ <gt/>
+ <ci> c </ci>
+ <cn type="integer"> 4 </cn>
+ </apply>
+ <apply>
+ <gt/>
+ <ci> c </ci>
+ <cn type="integer"> 4 </cn>
+ </apply>
+ </piece>
+ <piece>
+ <apply>
+ <times/>
+ <ci> p </ci>
+ <cn type="integer"> 6 </cn>
+ </apply>
+ <apply>
+ <gt/>
+ <ci> c </ci>
+ <cn type="integer"> 4 </cn>
+ </apply>
+ </piece>
+ <otherwise>
+ <apply>
+ <gt/>
+ <ci> p1 </ci>
+ <cn> 3.5 </cn>
+ </apply>
+ </otherwise>
+ </piecewise>
+ </math>
+ </constraint>
+ </listOfConstraints>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10212-fail-01-13.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10212-fail-01-13.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10212-fail-01-13.xml 2010-04-27 18:13:29 UTC (rev 11217)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" constant="false"/>
+ </listOfCompartments>
+ <listOfParameters>
+ <parameter id="p" value="1" constant="false"/>
+ <parameter id="p1" value="1" units="metre" constant="false"/>
+ </listOfParameters>
+ <listOfRules>
+ <algebraicRule>
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <piecewise>
+ <piece>
+ <apply>
+ <times/>
+ <ci> p </ci>
+ <cn type="integer"> 6 </cn>
+ </apply>
+ <apply>
+ <gt/>
+ <ci> c </ci>
+ <cn type="integer"> 4 </cn>
+ </apply>
+ </piece>
+ <piece>
+ <apply>
+ <times/>
+ <ci> p </ci>
+ <cn type="integer"> 7 </cn>
+ </apply>
+ <apply>
+ <gt/>
+ <ci> c </ci>
+ <cn type="integer"> 4 </cn>
+ </apply>
+ </piece>
+ <otherwise>
+ <apply>
+ <gt/>
+ <ci> p1 </ci>
+ <cn> 3.5 </cn>
+ </apply>
+ </otherwise>
+ </piecewise>
+ </math>
+ </algebraicRule>
+ </listOfRules>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10212-fail-02-14.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10212-fail-02-14.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10212-fail-02-14.xml 2010-04-27 18:13:29 UTC (rev 11217)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" constant="false"/>
+ </listOfCompartments>
+ <listOfParameters>
+ <parameter id="p" value="1" constant="false"/>
+ <parameter id="p1" value="1" units="metre" constant="false"/>
+ </listOfParameters>
+ <listOfRules>
+ <algebraicRule>
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <piecewise>
+ <piece>
+ <apply>
+ <times/>
+ <ci> p </ci>
+ <cn type="integer"> 6 </cn>
+ </apply>
+ <apply>
+ <gt/>
+ <ci> c </ci>
+ <cn type="integer"> 4 </cn>
+ </apply>
+ </piece>
+ <piece>
+ <apply>
+ <gt/>
+ <ci> c </ci>
+ <cn type="integer"> 4 </cn>
+ </apply>
+ <apply>
+ <gt/>
+ <ci> c </ci>
+ <cn type="integer"> 4 </cn>
+ </apply>
+ </piece>
+ <otherwise>
+ <apply>
+ <gt/>
+ <ci> p1 </ci>
+ <cn> 3.5 </cn>
+ </apply>
+ </otherwise>
+ </piecewise>
+ </math>
+ </algebraicRule>
+ </listOfRules>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10212-pass-00-07.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10212-pass-00-07.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10212-pass-00-07.xml 2010-04-27 18:13:29 UTC (rev 11217)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" constant="false"/>
+ </listOfCompartments>
+ <listOfParameters>
+ <parameter id="p" value="1" constant="false"/>
+ <parameter id="p1" value="1" units="metre" constant="false"/>
+ </listOfParameters>
+ <listOfRules>
+ <algebraicRule>
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <piecewise>
+ <piece>
+ <apply>
+ <times/>
+ <ci> p1 </ci>
+ <cn type="integer"> 6 </cn>
+ </apply>
+ <apply>
+ <gt/>
+ <ci> c </ci>
+ <cn type="integer"> 4 </cn>
+ </apply>
+ </piece>
+ <otherwise>
+ <ci> p1 </ci>
+ </otherwise>
+ </piecewise>
+ </math>
+ </algebraicRule>
+ </listOfRules>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10212-pass-00-08.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10212-pass-00-08.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10212-pass-00-08.xml 2010-04-27 18:13:29 UTC (rev 11217)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" constant="false"/>
+ </listOfCompartments>
+ <listOfParameters>
+ <parameter id="p" value="1" constant="false"/>
+ <parameter id="p1" value="1" units="metre" constant="false"/>
+ </listOfParameters>
+ <listOfRules>
+ <algebraicRule>
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <piecewise>
+ <piece>
+ <apply>
+ <times/>
+ <ci> p1 </ci>
+ <cn type="integer"> 6 </cn>
+ </apply>
+ <apply>
+ <gt/>
+ <ci> c </ci>
+ <cn type="integer"> 4 </cn>
+ </apply>
+ </piece>
+ </piecewise>
+ </math>
+ </algebraicRule>
+ </listOfRules>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10213-fail-01-11.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10213-fail-01-11.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10213-fail-01-11.xml 2010-04-27 18:13:29 UTC (rev 11217)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" constant="false"/>
+ </listOfCompartments>
+ <listOfParameters>
+ <parameter id="p" value="1" constant="false"/>
+ <parameter id="p1" value="1" units="metre" constant="false"/>
+ </listOfParameters>
+ <listOfRules>
+ <algebraicRule>
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <piecewise>
+ <piece>
+ <apply>
+ <times/>
+ <ci> p1 </ci>
+ <cn type="integer"> 6 </cn>
+ </apply>
+ <apply>
+ <plus/>
+ <cn type="integer"> 5 </cn>
+ <cn type="integer"> 4 </cn>
+ </apply>
+ </piece>
+ <otherwise>
+ <ci> p1 </ci>
+ </otherwise>
+ </piecewise>
+ </math>
+ </algebraicRule>
+ </listOfRules>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10213-pass-00-09.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10213-pass-00-09.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10213-pass-00-09.xml 2010-04-27 18:13:29 UTC (rev 11217)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" constant="false"/>
+ </listOfCompartments>
+ <listOfParameters>
+ <parameter id="p" value="1" constant="false"/>
+ <parameter id="p1" value="1" units="metre" constant="false"/>
+ </listOfParameters>
+ <listOfRules>
+ <algebraicRule>
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <piecewise>
+ <piece>
+ <apply>
+ <times/>
+ <ci> p1 </ci>
+ <cn type="integer"> 6 </cn>
+ </apply>
+ <apply>
+ <gt/>
+ <ci> c </ci>
+ <cn type="integer"> 4 </cn>
+ </apply>
+ </piece>
+ <otherwise>
+ <ci> p1 </ci>
+ </otherwise>
+ </piecewise>
+ </math>
+ </algebraicRule>
+ </listOfRules>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10214-fail-01-05.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10214-fail-01-05.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10214-fail-01-05.xml 2010-04-27 18:13:29 UTC (rev 11217)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfFunctionDefinitions>
+ <functionDefinition id="fpow">
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <lambda>
+ <bvar>
+ <ci> x </ci>
+ </bvar>
+ <bvar>
+ <ci> y </ci>
+ </bvar>
+ <apply>
+ <power/>
+ <ci> x </ci>
+ <ci> y </ci>
+ </apply>
+ </lambda>
+ </math>
+ </functionDefinition>
+ </listOfFunctionDefinitions>
+ <listOfCompartments>
+ <compartment id="cell" size="0.013" constant="true"/>
+ </listOfCompartments>
+ <listOfSpecies>
+ <species id="X0" compartment="cell" hasOnlySubstanceUnits="false" boundaryCondition="false" constant="false"/>
+ </listOfSpecies>
+ <listOfParameters>
+ <parameter id="z" constant="false"/>
+ </listOfParameters>
+ <listOfInitialAssignments>
+ <initialAssignment symbol="z">
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <ci> X0 </ci>
+ <ci> cell </ci>
+ <cn type="integer"> 3 </cn>
+ </apply>
+ </math>
+ </initialAssignment>
+ </listOfInitialAssignments>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10214-pass-00-05.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10214-pass-00-05.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10214-pass-00-05.xml 2010-04-27 18:13:29 UTC (rev 11217)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfFunctionDefinitions>
+ <functionDefinition id="fpow">
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <lambda>
+ <bvar>
+ <ci> x </ci>
+ </bvar>
+ <bvar>
+ <ci> y </ci>
+ </bvar>
+ <apply>
+ <power/>
+ <ci> x </ci>
+ <ci> y </ci>
+ </apply>
+ </lambda>
+ </math>
+ </functionDefinition>
+ </listOfFunctionDefinitions>
+ <listOfCompartments>
+ <compartment id="cell" size="0.013" constant="true"/>
+ </listOfCompartments>
+ <listOfSpecies>
+ <species id="X0" compartment="cell" hasOnlySubstanceUnits="false" boundaryCondition="false" constant="false"/>
+ </listOfSpecies>
+ <listOfParameters>
+ <parameter id="z" constant="false"/>
+ </listOfParameters>
+ <listOfInitialAssignments>
+ <initialAssignment symbol="z">
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <ci> fpow </ci>
+ <ci> cell </ci>
+ <cn type="integer"> 3 </cn>
+ </apply>
+ </math>
+ </initialAssignment>
+ </listOfInitialAssignments>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10215-fail-01-05.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10215-fail-01-05.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10215-fail-01-05.xml 2010-04-27 18:13:29 UTC (rev 11217)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfUnitDefinitions>
+ <unitDefinition id="gg">
+ <listOfUnits>
+ <unit kind="mole" multiplier="1" scale="0" exponent="1"/>
+ </listOfUnits>
+ </unitDefinition>
+ </listOfUnitDefinitions>
+ <listOfCompartments>
+ <compartment id="c" units="litre" constant="false"/>
+ </listOfCompartments>
+ <listOfConstraints>
+ <constraint>
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <neq/>
+ <apply>
+ <gt/>
+ <ci> gg </ci>
+ <cn type="integer"> 6 </cn>
+ </apply>
+ <true/>
+ </apply>
+ </math>
+ </constraint>
+ </listOfConstraints>
+ </model>
+</sbml>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sar...@us...> - 2010-04-27 18:12:03
|
Revision: 11216
http://sbml.svn.sourceforge.net/sbml/?rev=11216&view=rev
Author: sarahkeating
Date: 2010-04-27 18:11:57 +0000 (Tue, 27 Apr 2010)
Log Message:
-----------
merging changes from 4.1
Added Paths:
-----------
branches/libsbml-5/src/validator/test/test-data/10101-fail-01-07.xml
branches/libsbml-5/src/validator/test/test-data/10101-pass-00-09.xml
branches/libsbml-5/src/validator/test/test-data/10102-fail-01-25.xml
branches/libsbml-5/src/validator/test/test-data/10201-fail-01-05.xml
branches/libsbml-5/src/validator/test/test-data/10201-pass-00-09.xml
branches/libsbml-5/src/validator/test/test-data/10202-fail-01-05-10217.xml
branches/libsbml-5/src/validator/test/test-data/10202-pass-00-05.xml
branches/libsbml-5/src/validator/test/test-data/10203-fail-01-05.xml
branches/libsbml-5/src/validator/test/test-data/10203-pass-00-05.xml
branches/libsbml-5/src/validator/test/test-data/10204-fail-01-05.xml
branches/libsbml-5/src/validator/test/test-data/10204-pass-00-07.xml
branches/libsbml-5/src/validator/test/test-data/10204-pass-00-08.xml
branches/libsbml-5/src/validator/test/test-data/10205-fail-01-05-10214.xml
branches/libsbml-5/src/validator/test/test-data/10205-pass-00-09.xml
branches/libsbml-5/src/validator/test/test-data/10205-pass-00-10.xml
branches/libsbml-5/src/validator/test/test-data/10205-pass-00-11.xml
branches/libsbml-5/src/validator/test/test-data/10206-fail-01-05.xml
branches/libsbml-5/src/validator/test/test-data/10206-pass-00-05.xml
Removed Paths:
-------------
branches/libsbml-5/src/validator/test/test-data/01015-fail-01-12.xml
branches/libsbml-5/src/validator/test/test-data/01015-fail-01-13.xml
Deleted: branches/libsbml-5/src/validator/test/test-data/01015-fail-01-12.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/01015-fail-01-12.xml 2010-04-27 13:14:44 UTC (rev 11215)
+++ branches/libsbml-5/src/validator/test/test-data/01015-fail-01-12.xml 2010-04-27 18:11:57 UTC (rev 11216)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sbml xmlns="http://www.sbml.org/sbml/level2/version3" version="3">
- <model>
- <listOfCompartments>
- <compartment id="c"/>
- </listOfCompartments>
- </model>
-</sbml>
Deleted: branches/libsbml-5/src/validator/test/test-data/01015-fail-01-13.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/01015-fail-01-13.xml 2010-04-27 13:14:44 UTC (rev 11215)
+++ branches/libsbml-5/src/validator/test/test-data/01015-fail-01-13.xml 2010-04-27 18:11:57 UTC (rev 11216)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sbml xmlns="http://www.sbml.org/sbml/level2/version4" level="2">
- <model>
- <listOfCompartments>
- <compartment id="c"/>
- </listOfCompartments>
- </model>
-</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10101-fail-01-07.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10101-fail-01-07.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10101-fail-01-07.xml 2010-04-27 18:11:57 UTC (rev 11216)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="US-ASCII"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model/>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10101-pass-00-09.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10101-pass-00-09.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10101-pass-00-09.xml 2010-04-27 18:11:57 UTC (rev 11216)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model/>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10102-fail-01-25.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10102-fail-01-25.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10102-fail-01-25.xml 2010-04-27 18:11:57 UTC (rev 11216)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <sarah/>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10201-fail-01-05.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10201-fail-01-05.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10201-fail-01-05.xml 2010-04-27 18:11:57 UTC (rev 11216)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" constant="false"/>
+ </listOfCompartments>
+ <listOfParameters>
+ <parameter id="p" value="1" constant="false"/>
+ <parameter id="p1" units="metre" value="1" constant="false"/>
+ <parameter id="delta_t" units="second" value="1" constant="false"/>
+ </listOfParameters>
+ <listOfRules>
+ <assignmentRule variable="p">
+ <math>
+ <apply>
+ <times/>
+ <cn> 5 </cn>
+ <cn> 5 </cn>
+ </apply>
+ </math>
+ </assignmentRule>
+ </listOfRules>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10201-pass-00-09.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10201-pass-00-09.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10201-pass-00-09.xml 2010-04-27 18:11:57 UTC (rev 11216)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" constant="false"/>
+ </listOfCompartments>
+ <listOfParameters>
+ <parameter id="p" value="1" constant="false"/>
+ <parameter id="p1" value="1" units="metre" constant="false"/>
+ <parameter id="delta_t" value="1" units="second" constant="false"/>
+ </listOfParameters>
+ <listOfRules>
+ <assignmentRule variable="p">
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <times/>
+ <cn type="integer"> 5 </cn>
+ <cn type="integer"> 5 </cn>
+ </apply>
+ </math>
+ </assignmentRule>
+ </listOfRules>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10202-fail-01-05-10217.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10202-fail-01-05-10217.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10202-fail-01-05-10217.xml 2010-04-27 18:11:57 UTC (rev 11216)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" constant="false"/>
+ </listOfCompartments>
+ <listOfParameters>
+ <parameter id="p" value="1" constant="false"/>
+ <parameter id="p1" units="metre" value="1" constant="false"/>
+ <parameter id="delta_t" units="second" value="1" constant="false"/>
+ </listOfParameters>
+ <listOfRules>
+ <assignmentRule variable="p">
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <mean/>
+ <cn> 5 </cn>
+ <cn> 5 </cn>
+ </apply>
+ </math>
+ </assignmentRule>
+ </listOfRules>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10202-pass-00-05.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10202-pass-00-05.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10202-pass-00-05.xml 2010-04-27 18:11:57 UTC (rev 11216)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" constant="false"/>
+ </listOfCompartments>
+ <listOfParameters>
+ <parameter id="p" value="1" constant="false"/>
+ <parameter id="p1" value="1" units="metre" constant="false"/>
+ <parameter id="delta_t" value="1" units="second" constant="false"/>
+ </listOfParameters>
+ <listOfRules>
+ <assignmentRule variable="p">
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <times/>
+ <cn type="integer"> 5 </cn>
+ <cn type="integer"> 5 </cn>
+ </apply>
+ </math>
+ </assignmentRule>
+ </listOfRules>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10203-fail-01-05.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10203-fail-01-05.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10203-fail-01-05.xml 2010-04-27 18:11:57 UTC (rev 11216)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" constant="false"/>
+ </listOfCompartments>
+ <listOfParameters>
+ <parameter id="p" value="1" constant="false"/>
+ <parameter id="p1" units="metre" value="1" constant="false"/>
+ <parameter id="delta_t" units="second" value="1" constant="false"/>
+ </listOfParameters>
+ <listOfRules>
+ <algebraicRule>
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <times/>
+ <ci encoding="text"> p </ci>
+ <apply>
+ <csymbol encoding="text" definitionURL="http://www.sbml.org/sbml/symbols/delay">
+ delay
+ </csymbol>
+ <ci> p1 </ci>
+ <ci> delta_t </ci>
+ </apply>
+ </apply>
+ </math>
+ </algebraicRule>
+ </listOfRules>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10203-pass-00-05.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10203-pass-00-05.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10203-pass-00-05.xml 2010-04-27 18:11:57 UTC (rev 11216)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" constant="false"/>
+ </listOfCompartments>
+ <listOfParameters>
+ <parameter id="p" value="1" constant="false"/>
+ <parameter id="p1" value="1" units="metre" constant="false"/>
+ <parameter id="delta_t" value="1" units="second" constant="false"/>
+ </listOfParameters>
+ <listOfRules>
+ <algebraicRule>
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <times/>
+ <ci> p </ci>
+ <apply>
+ <csymbol encoding="text" definitionURL="http://www.sbml.org/sbml/symbols/delay"> delay </csymbol>
+ <ci> p1 </ci>
+ <ci> delta_t </ci>
+ </apply>
+ </apply>
+ </math>
+ </algebraicRule>
+ </listOfRules>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10204-fail-01-05.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10204-fail-01-05.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10204-fail-01-05.xml 2010-04-27 18:11:57 UTC (rev 11216)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" constant="false"/>
+ </listOfCompartments>
+ <listOfParameters>
+ <parameter id="p" value="1" constant="false"/>
+ <parameter id="p1" units="metre" value="1" constant="false"/>
+ <parameter id="delta_t" units="second" value="1" constant="false"/>
+ </listOfParameters>
+ <listOfRules>
+ <algebraicRule>
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <times/>
+ <ci> p </ci>
+ <apply>
+ <csymbol encoding="text" definitionURL="http://www.sbml.org/sbml/symbols/delay">
+ delay
+ </csymbol>
+ <ci> p1 </ci>
+ <cn definitionURL="http://www.sbml.org/sbml/symbols/delay"> 2 </cn>
+ </apply>
+ </apply>
+ </math>
+ </algebraicRule>
+ </listOfRules>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10204-pass-00-07.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10204-pass-00-07.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10204-pass-00-07.xml 2010-04-27 18:11:57 UTC (rev 11216)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" constant="false"/>
+ </listOfCompartments>
+ <listOfParameters>
+ <parameter id="p" value="1" constant="false"/>
+ <parameter id="p1" value="1" units="metre" constant="false"/>
+ <parameter id="delta_t" value="1" units="second" constant="false"/>
+ </listOfParameters>
+ <listOfRules>
+ <algebraicRule>
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <times/>
+ <ci> p </ci>
+ <apply>
+ <csymbol encoding="text" definitionURL="http://www.sbml.org/sbml/symbols/delay"> delay </csymbol>
+ <ci> p1 </ci>
+ <ci> delta_t </ci>
+ </apply>
+ </apply>
+ </math>
+ </algebraicRule>
+ </listOfRules>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10204-pass-00-08.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10204-pass-00-08.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10204-pass-00-08.xml 2010-04-27 18:11:57 UTC (rev 11216)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" constant="false"/>
+ </listOfCompartments>
+ <listOfParameters>
+ <parameter id="p" value="1" constant="false"/>
+ <parameter id="p1" units="metre" value="1" constant="false"/>
+ <parameter id="delta_t" units="second" value="1" constant="false"/>
+ </listOfParameters>
+ <listOfRules>
+ <algebraicRule>
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <times/>
+ <ci definitionURL="http://www.sbml.org/sbml/symbols/delay"> p </ci>
+ <apply>
+ <csymbol encoding="text" definitionURL="http://www.sbml.org/sbml/symbols/delay">
+ delay
+ </csymbol>
+ <ci> p1 </ci>
+ <ci> delta_t </ci>
+ </apply>
+ </apply>
+ </math>
+ </algebraicRule>
+ </listOfRules>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10205-fail-01-05-10214.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10205-fail-01-05-10214.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10205-fail-01-05-10214.xml 2010-04-27 18:11:57 UTC (rev 11216)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" constant="false"/>
+ </listOfCompartments>
+ <listOfParameters>
+ <parameter id="p" value="1" constant="false"/>
+ <parameter id="p1" units="metre" value="1" constant="false"/>
+ <parameter id="delta_t" units="second" value="1" constant="false"/>
+ </listOfParameters>
+ <listOfRules>
+ <algebraicRule>
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <times/>
+ <ci> p </ci>
+ <apply>
+ <csymbol encoding="text" definitionURL="http://www.sbml.org/sbml/symbols/other">
+ time
+ </csymbol>
+ <ci> p1 </ci>
+ <ci> delta_t </ci>
+ </apply>
+ </apply>
+ </math>
+ </algebraicRule>
+ </listOfRules>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10205-pass-00-09.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10205-pass-00-09.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10205-pass-00-09.xml 2010-04-27 18:11:57 UTC (rev 11216)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" constant="false"/>
+ </listOfCompartments>
+ <listOfParameters>
+ <parameter id="p" value="1" constant="false"/>
+ <parameter id="p1" value="1" units="metre" constant="false"/>
+ <parameter id="delta_t" value="1" units="second" constant="false"/>
+ </listOfParameters>
+ <listOfRules>
+ <algebraicRule>
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <times/>
+ <ci> p </ci>
+ <apply>
+ <csymbol encoding="text" definitionURL="http://www.sbml.org/sbml/symbols/delay"> delay </csymbol>
+ <ci> p1 </ci>
+ <ci> delta_t </ci>
+ </apply>
+ </apply>
+ </math>
+ </algebraicRule>
+ </listOfRules>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10205-pass-00-10.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10205-pass-00-10.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10205-pass-00-10.xml 2010-04-27 18:11:57 UTC (rev 11216)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" constant="false"/>
+ </listOfCompartments>
+ <listOfParameters>
+ <parameter id="p" value="1" constant="false"/>
+ <parameter id="p1" value="1" units="metre" constant="false"/>
+ <parameter id="delta_t" value="1" units="second" constant="false"/>
+ </listOfParameters>
+ <listOfRules>
+ <algebraicRule>
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <times/>
+ <ci> p </ci>
+ <csymbol encoding="text" definitionURL="http://www.sbml.org/sbml/symbols/time">
+ time
+ </csymbol>
+ <ci> p1 </ci>
+ <ci> delta_t </ci>
+ </apply>
+ </math>
+ </algebraicRule>
+ </listOfRules>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10205-pass-00-11.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10205-pass-00-11.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10205-pass-00-11.xml 2010-04-27 18:11:57 UTC (rev 11216)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" constant="false"/>
+ </listOfCompartments>
+ <listOfParameters>
+ <parameter id="p" value="1" constant="false"/>
+ <parameter id="p1" value="1" units="metre" constant="false"/>
+ <parameter id="delta_t" value="1" units="second" constant="false"/>
+ </listOfParameters>
+ <listOfRules>
+ <algebraicRule>
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <times/>
+ <ci> p </ci>
+ <csymbol encoding="text" definitionURL="http://www.sbml.org/sbml/symbols/avogadro">
+ time
+ </csymbol>
+ <ci> p1 </ci>
+ <ci> delta_t </ci>
+ </apply>
+ </math>
+ </algebraicRule>
+ </listOfRules>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10206-fail-01-05.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10206-fail-01-05.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10206-fail-01-05.xml 2010-04-27 18:11:57 UTC (rev 11216)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" constant="false"/>
+ </listOfCompartments>
+ <listOfParameters>
+ <parameter id="p" value="1" constant="false"/>
+ <parameter id="p1" units="metre" value="1" constant="false"/>
+ <parameter id="delta_t" units="second" value="1" constant="false"/>
+ </listOfParameters>
+ <listOfRules>
+ <assignmentRule variable="p">
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <times/>
+ <ci type="integer"> p1 </ci>
+ <cn> 5 </cn>
+ <cn> 5 </cn>
+ </apply>
+ </math>
+ </assignmentRule>
+ </listOfRules>
+ </model>
+</sbml>
Added: branches/libsbml-5/src/validator/test/test-data/10206-pass-00-05.xml
===================================================================
--- branches/libsbml-5/src/validator/test/test-data/10206-pass-00-05.xml (rev 0)
+++ branches/libsbml-5/src/validator/test/test-data/10206-pass-00-05.xml 2010-04-27 18:11:57 UTC (rev 11216)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model>
+ <listOfCompartments>
+ <compartment id="c" constant="false"/>
+ </listOfCompartments>
+ <listOfParameters>
+ <parameter id="p" value="1" constant="false"/>
+ <parameter id="p1" value="1" units="metre" constant="false"/>
+ <parameter id="delta_t" value="1" units="second" constant="false"/>
+ </listOfParameters>
+ <listOfRules>
+ <assignmentRule variable="p">
+ <math xmlns="http://www.w3.org/1998/Math/MathML">
+ <apply>
+ <times/>
+ <ci> p1 </ci>
+ <cn type="integer"> 5 </cn>
+ <cn type="integer"> 5 </cn>
+ </apply>
+ </math>
+ </assignmentRule>
+ </listOfRules>
+ </model>
+</sbml>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sar...@us...> - 2010-04-27 13:14:51
|
Revision: 11215
http://sbml.svn.sourceforge.net/sbml/?rev=11215&view=rev
Author: sarahkeating
Date: 2010-04-27 13:14:44 +0000 (Tue, 27 Apr 2010)
Log Message:
-----------
updated the files necessary to do a 3.1.2 release which contains a fully functioning libsbml installer
Modified Paths:
--------------
trunk/SBMLToolbox/NEWS.txt
trunk/SBMLToolbox/VERSION.txt
trunk/SBMLToolbox/win32_installer/install-sbmltoolbox-script.iss
Modified: trunk/SBMLToolbox/NEWS.txt
===================================================================
--- trunk/SBMLToolbox/NEWS.txt 2010-04-27 06:00:25 UTC (rev 11214)
+++ trunk/SBMLToolbox/NEWS.txt 2010-04-27 13:14:44 UTC (rev 11215)
@@ -1,6 +1,16 @@
SBMLToolbox NEWS -- History of user-visible changes
+---------------------------------------------------
+Version 3.1.2 Released 2010-04-27
+---------------------------------------------------
+This release adds a missing file to the windows installer
+for libSBML-4.0.1 that is embedded in the windows
+installer for SBMLToolbox.
+
+There are no functional changes.
+
+
---------------------------------------------------
Version 3.1.1 Released 2010-04-12
---------------------------------------------------
Modified: trunk/SBMLToolbox/VERSION.txt
===================================================================
--- trunk/SBMLToolbox/VERSION.txt 2010-04-27 06:00:25 UTC (rev 11214)
+++ trunk/SBMLToolbox/VERSION.txt 2010-04-27 13:14:44 UTC (rev 11215)
@@ -1 +1 @@
-3.1.1
+3.1.2
Modified: trunk/SBMLToolbox/win32_installer/install-sbmltoolbox-script.iss
===================================================================
--- trunk/SBMLToolbox/win32_installer/install-sbmltoolbox-script.iss 2010-04-27 06:00:25 UTC (rev 11214)
+++ trunk/SBMLToolbox/win32_installer/install-sbmltoolbox-script.iss 2010-04-27 13:14:44 UTC (rev 11215)
@@ -1,18 +1,18 @@
[Setup]
AppName=SBMLToolbox
-AppVerName=SBMLToolbox 3.1.1
+AppVerName=SBMLToolbox 3.1.2
AppPublisher=SBMLTeam
AppPublisherURL=http://www.sbml.org
AppSupportURL=http://www.sbml.org
AppUpdatesURL=http://www.sbml.org
-DefaultDirName={pf}\SBML\SBMLToolbox-3.1.1
+DefaultDirName={pf}\SBML\SBMLToolbox-3.1.2
DefaultGroupName=SBMLToolbox
DisableProgramGroupPage=yes
OutputDir=..\win32_installer\Output
-OutputBaseFilename=SBMLToolbox-3.1.1-setup-win32
+OutputBaseFilename=SBMLToolbox-3.1.2-setup-win32
WizardSmallImageFile=sbmltoolbox-installer-mini-logo.bmp
WizardImageFile=sbmltoolbox-installer-graphic.bmp
UsePreviousAppDir=no
@@ -30,7 +30,7 @@
Root: HKCU; Subkey: Software\SBML\SBMLToolbox; Flags: uninsdeletekey
Root: HKLM; Subkey: Software\SBML; Flags: uninsdeletekeyifempty
Root: HKLM; Subkey: Software\SBML\SBMLToolbox; Flags: uninsdeletekey
-Root: HKLM; Subkey: Software\SBML\SBMLToolbox; ValueType: string; ValueName: Version; ValueData: 3.1.1
+Root: HKLM; Subkey: Software\SBML\SBMLToolbox; ValueType: string; ValueName: Version; ValueData: 3.1.2
Root: HKLM; Subkey: Software\SBML\SBMLToolbox; ValueType: string; ValueName: InstallPath; ValueData: {app}
[Code]
@@ -57,7 +57,7 @@
Note: it includes a version number
**********************************************************************************************************}
- MsgBox('This setup installs the Windows release of SBMLToolbox 3.1.1. This requires libSBML 4.0.1. This installer will allow you to install libSBML if it is not already present.', mbInformation, mb_Ok);
+ MsgBox('This setup installs the Windows release of SBMLToolbox 3.1.2. This requires libSBML 4.0.1. This installer will allow you to install libSBML if it is not already present.', mbInformation, mb_Ok);
end;
procedure URLLabelOnClick(Sender: TObject);
@@ -216,7 +216,7 @@
{look for a version no and check whether it is later than this}
ToolboxVersion := GetToolboxVersion();
- LaterToolboxVers := LaterVersion(ToolboxVersion, '3.1.1');
+ LaterToolboxVers := LaterVersion(ToolboxVersion, '3.1.2');
if not MatlabExists then begin
Result := MsgBox('MATLAB cannot be located on this system.' #13 'The SBMLToolbox requires MATLAB.' #13#13 'Do you want to continue?', mbConfirmation, MB_YESNO) = idYes;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mh...@us...> - 2010-04-27 06:00:32
|
Revision: 11214
http://sbml.svn.sourceforge.net/sbml/?rev=11214&view=rev
Author: mhucka
Date: 2010-04-27 06:00:25 +0000 (Tue, 27 Apr 2010)
Log Message:
-----------
Under MacOS 10.5, when libsbml is built as a FAT
binary including x86_64, some language bindings must be built explicitly as 32-bit.
Modified Paths:
--------------
trunk/libsbml/src/bindings/python/Makefile.in
trunk/libsbml/src/bindings/ruby/Makefile.in
Modified: trunk/libsbml/src/bindings/python/Makefile.in
===================================================================
--- trunk/libsbml/src/bindings/python/Makefile.in 2010-04-27 05:42:36 UTC (rev 11213)
+++ trunk/libsbml/src/bindings/python/Makefile.in 2010-04-27 06:00:25 UTC (rev 11214)
@@ -76,15 +76,34 @@
#############################################################################
-# environment variable MACOSX_DEPLOYMENT_TARGET must be set to 10.3 or later
+# Environment variable MACOSX_DEPLOYMENT_TARGET must be set to 10.3 or later
# to use -undefined dynamic_lookup.
+
ifeq "$(HOST_TYPE)" "darwin"
- macosx_version=$(shell sw_vers -productVersion | cut -d"." -f1,2)
- export MACOSX_DEPLOYMENT_TARGET=${macosx_version}
+ export MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION)
%.so: $(objfiles)
$(call link_dl_lib,$@)
endif
+# If we're building 64-bit binaries, but are not running under 10.6, the
+# version of python will probably be 32 bit instead of 64 bit.
+
+ifdef USE_UNIVBINARY
+ ifneq "$(MACOS_VERSION)" "10.6"
+
+ filtered_cflags = $(shell echo '$(CFLAGS)' | sed -e "s/-arch x86_64//g")
+ filtered_cppflags = $(shell echo '$(CPPFLAGS)' | sed -e "s/-arch x86_64//g")
+ filtered_cxxflags = $(shell echo '$(CXXFLAGS)' | sed -e "s/-arch x86_64//g")
+ filtered_ldflags = $(shell echo '$(LDFLAGS)' | sed -e "s/-arch x86_64//g")
+
+ CFLAGS := $(filtered_cflags)
+ CPPFLAGS := $(filtered_cppflags)
+ CXXFLAGS := $(filtered_cxxflags)
+ LDFLAGS := $(filtered_ldflags)
+
+ endif
+endif
+
# Variables `subdirs', `headers', `sources', `libraries', `extra_CPPFLAGS',
# `extra_CXXFLAGS', `extra_LDFLAGS' and `distfiles' are used by the default
# rules in `makefile-common-actions.mk' included at the end.
Modified: trunk/libsbml/src/bindings/ruby/Makefile.in
===================================================================
--- trunk/libsbml/src/bindings/ruby/Makefile.in 2010-04-27 05:42:36 UTC (rev 11213)
+++ trunk/libsbml/src/bindings/ruby/Makefile.in 2010-04-27 06:00:25 UTC (rev 11214)
@@ -85,6 +85,25 @@
libraries = libSBML.$(SHAREDLIBEXT)
endif
+# If we're building 64-bit binaries, but are not running under 10.6, the
+# version of ruby will probably be 32 bit instead of 64 bit.
+
+ifdef USE_UNIVBINARY
+ ifneq "$(MACOS_VERSION)" "10.6"
+
+ filtered_cflags = $(shell echo '$(CFLAGS)' | sed -e "s/-arch x86_64//g")
+ filtered_cppflags = $(shell echo '$(CPPFLAGS)' | sed -e "s/-arch x86_64//g")
+ filtered_cxxflags = $(shell echo '$(CXXFLAGS)' | sed -e "s/-arch x86_64//g")
+ filtered_ldflags = $(shell echo '$(LDFLAGS)' | sed -e "s/-arch x86_64//g")
+
+ CFLAGS := $(filtered_cflags)
+ CPPFLAGS := $(filtered_cppflags)
+ CXXFLAGS := $(filtered_cxxflags)
+ LDFLAGS := $(filtered_ldflags)
+
+ endif
+endif
+
# Variables `subdirs', `headers', `sources', `libraries', `extra_CPPFLAGS',
# `extra_CXXFLAGS', `extra_LDFLAGS' and `distfiles' are used by the default
# rules in `makefile-common-actions.mk' included at the end.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mh...@us...> - 2010-04-27 05:42:43
|
Revision: 11213
http://sbml.svn.sourceforge.net/sbml/?rev=11213&view=rev
Author: mhucka
Date: 2010-04-27 05:42:36 +0000 (Tue, 27 Apr 2010)
Log Message:
-----------
Updated for changes in makefile-common-actions.mk
Modified Paths:
--------------
trunk/libsbml/configure
Modified: trunk/libsbml/configure
===================================================================
--- trunk/libsbml/configure 2010-04-27 05:41:13 UTC (rev 11212)
+++ trunk/libsbml/configure 2010-04-27 05:42:36 UTC (rev 11213)
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.ac Revision: 11201 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for libSBML 4.1.0-b2.
+# Generated by GNU Autoconf 2.60 for libSBML 4.1.0-b2.
#
# Report bugs to <lib...@ca...>.
#
@@ -13,8 +13,7 @@
## M4sh Initialization. ##
## --------------------- ##
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
+# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -23,15 +22,12 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
-
-
# PATH needs CR
# Avoid depending upon Character Ranges.
as_cr_letters='abcdefghijklmnopqrstuvwxyz'
@@ -222,7 +218,7 @@
else
as_candidate_shells=
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -240,6 +236,7 @@
# Try only shells that exist, to save several forks.
if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
{ ("$as_shell") 2> /dev/null <<\_ASEOF
+# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -248,19 +245,18 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
-
:
_ASEOF
}; then
CONFIG_SHELL=$as_shell
as_have_required=yes
if { "$as_shell" 2> /dev/null <<\_ASEOF
+# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -269,13 +265,11 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
-
:
(as_func_return () {
(exit $1)
@@ -521,28 +515,19 @@
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
+# Find out whether ``test -x'' works. Don't use a zero-byte file, as
+# systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+ as_executable_p="test -x"
else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
+ as_executable_p=:
fi
-as_executable_p=$as_test_x
+rm -f conf$$.file
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -737,36 +722,36 @@
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
+#if HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
-#ifdef HAVE_SYS_STAT_H
+#if HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
-#ifdef STDC_HEADERS
+#if STDC_HEADERS
# include <stdlib.h>
# include <stddef.h>
#else
-# ifdef HAVE_STDLIB_H
+# if HAVE_STDLIB_H
# include <stdlib.h>
# endif
#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
# include <memory.h>
# endif
# include <string.h>
#endif
-#ifdef HAVE_STRINGS_H
+#if HAVE_STRINGS_H
# include <strings.h>
#endif
-#ifdef HAVE_INTTYPES_H
+#if HAVE_INTTYPES_H
# include <inttypes.h>
#endif
-#ifdef HAVE_STDINT_H
+#if HAVE_STDINT_H
# include <stdint.h>
#endif
-#ifdef HAVE_UNISTD_H
+#if HAVE_UNISTD_H
# include <unistd.h>
#endif"
@@ -965,7 +950,6 @@
CXX
CXXFLAGS
LDFLAGS
-LIBS
CPPFLAGS
CCC
CC
@@ -1083,10 +1067,10 @@
-disable-* | --disable-*)
ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
eval enable_$ac_feature=no ;;
-docdir | --docdir | --docdi | --doc | --do)
@@ -1102,10 +1086,10 @@
-enable-* | --enable-*)
ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
eval enable_$ac_feature=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
@@ -1299,19 +1283,19 @@
-with-* | --with-*)
ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+ ac_package=`echo $ac_package| sed 's/-/_/g'`
eval with_$ac_package=\$ac_optarg ;;
-without-* | --without-*)
ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+ ac_package=`echo $ac_package | sed 's/-/_/g'`
eval with_$ac_package=no ;;
--x)
@@ -1606,7 +1590,6 @@
CXXFLAGS C++ compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
- LIBS libraries to pass to the linker, e.g. -l<library>
CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CC C compiler command
@@ -1685,7 +1668,7 @@
if $ac_init_version; then
cat <<\_ACEOF
libSBML configure 4.1.0-b2
-generated by GNU Autoconf 2.61
+generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1699,7 +1682,7 @@
running configure, to aid debugging if configure makes a mistake.
It was created by libSBML $as_me 4.1.0-b2, which was
-generated by GNU Autoconf 2.61. Invocation command line was
+generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2351,7 +2334,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2395,7 +2378,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2529,7 +2512,7 @@
# in a Makefile. We should not override ac_cv_exeext if it was cached,
# so that the user can short-circuit this test for compilers unknown to
# Autoconf.
-for ac_file in $ac_files ''
+for ac_file in $ac_files
do
test -f "$ac_file" || continue
case $ac_file in
@@ -2557,12 +2540,6 @@
test "$ac_cv_exeext" = no && ac_cv_exeext=
else
- ac_file=''
-fi
-
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
-if test -z "$ac_file"; then
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -2574,6 +2551,8 @@
fi
ac_exeext=$ac_cv_exeext
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
@@ -2751,10 +2730,27 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
@@ -2809,10 +2805,27 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
@@ -2847,10 +2860,27 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
:
else
echo "$as_me: failed program was:" >&5
@@ -2886,10 +2916,27 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
@@ -2952,7 +2999,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2992,7 +3039,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3049,7 +3096,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3090,7 +3137,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
@@ -3148,7 +3195,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3192,7 +3239,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3312,10 +3359,27 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
@@ -3370,10 +3434,27 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
@@ -3408,10 +3489,27 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
:
else
echo "$as_me: failed program was:" >&5
@@ -3447,10 +3545,27 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
@@ -3566,10 +3681,27 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_prog_cc_c89=$ac_arg
else
echo "$as_me: failed program was:" >&5
@@ -3658,10 +3790,17 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
:
else
echo "$as_me: failed program was:" >&5
@@ -3695,10 +3834,17 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
# Broken: success on invalid input.
continue
else
@@ -3763,10 +3909,17 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
:
else
echo "$as_me: failed program was:" >&5
@@ -3800,10 +3953,17 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
# Broken: success on invalid input.
continue
else
@@ -3924,7 +4084,7 @@
test -z "$as_dir" && as_dir=.
for lt_ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
fi
done
@@ -3990,7 +4150,7 @@
for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+ { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
@@ -4072,7 +4232,7 @@
for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+ { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
@@ -4563,7 +4723,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4566 "configure"' > conftest.$ac_ext
+ echo '#line 4726 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -4694,11 +4854,27 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
lt_cv_cc_needs_belf=yes
else
echo "$as_me: failed program was:" >&5
@@ -4707,7 +4883,7 @@
lt_cv_cc_needs_belf=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -4765,7 +4941,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4805,7 +4981,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_DLLTOOL="dlltool"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4861,7 +5037,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AS="${ac_tool_prefix}as"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4901,7 +5077,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_AS="as"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4957,7 +5133,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4997,7 +5173,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_OBJDUMP="objdump"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5081,10 +5257,27 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_header_stdc=yes
else
echo "$as_me: failed program was:" >&5
@@ -5260,10 +5453,27 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
@@ -5326,10 +5536,27 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
@@ -5365,10 +5592,17 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -5485,10 +5719,17 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- }; then
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
:
else
echo "$as_me: failed program was:" >&5
@@ -5522,10 +5763,17 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- }; then
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
# Broken: success on invalid input.
continue
else
@@ -5590,10 +5838,17 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- }; then
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
:
else
echo "$as_me: failed program was:" >&5
@@ -5627,10 +5882,17 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- }; then
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
# Broken: success on invalid input.
continue
else
@@ -5671,7 +5933,7 @@
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_f77_compiler_gnu
if test -n "$ac_tool_prefix"; then
- for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
+ for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -5689,7 +5951,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5715,7 +5977,7 @@
fi
if test -z "$F77"; then
ac_ct_F77=$F77
- for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
+ for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -5733,7 +5995,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_F77="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5840,10 +6102,27 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_f77_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
@@ -5886,10 +6165,27 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_f77_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_prog_f77_g=yes
else
echo "$as_me: failed program was:" >&5
@@ -6347,7 +6643,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AR="${ac_tool_prefix}ar"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6387,7 +6683,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_AR="ar"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6443,7 +6739,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6483,7 +6779,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6539,7 +6835,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6579,7 +6875,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_STRIP="strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6823,7 +7119,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6863,7 +7159,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6919,7 +7215,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6959,7 +7255,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_NMEDIT="nmedit"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7059,11 +7355,27 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
lt_cv_ld_exported_symbols_list=yes
else
echo "$as_me: failed program was:" >&5
@@ -7072,7 +7384,7 @@
lt_cv_ld_exported_symbols_list=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LDFLAGS="$save_LDFLAGS"
@@ -7212,11 +7524,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7215: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7527: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7219: \$? = $ac_status" >&5
+ echo "$as_me:7531: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7502,11 +7814,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7505: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7817: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7509: \$? = $ac_status" >&5
+ echo "$as_me:7821: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7606,11 +7918,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7609: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7921: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7613: \$? = $ac_status" >&5
+ echo "$as_me:7925: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8096,11 +8408,27 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
@@ -8121,7 +8449,7 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -8162,11 +8490,27 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
@@ -8187,7 +8531,7 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -9467,11 +9811,27 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_lib_dl_dlopen=yes
else
echo "$as_me: failed program was:" >&5
@@ -9480,7 +9840,7 @@
ac_cv_lib_dl_dlopen=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -9562,11 +9922,27 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_func_shl_load=yes
else
echo "$as_me: failed program was:" >&5
@@ -9575,7 +9951,7 @@
ac_cv_func_shl_load=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
@@ -9625,11 +10001,27 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_lib_dld_shl_load=yes
else
echo "$as_me: failed program was:" >&5
@@ -9638,7 +10030,7 @@
ac_cv_lib_dld_shl_load=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -9710,11 +10102,27 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_func_dlopen=yes
else
echo "$as_me: failed program was:" >&5
@@ -9723,7 +10131,7 @@
ac_cv_func_dlopen=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
@@ -9773,11 +10181,27 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_lib_dl_dlopen=yes
else
echo "$as_me: failed program was:" >&5
@@ -9786,7 +10210,7 @@
ac_cv_lib_dl_dlopen=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -9837,11 +10261,27 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_lib_svld_dlopen=yes
else
echo "$as_me: failed program was:" >&5
@@ -9850,7 +10290,7 @@
ac_cv_lib_svld_dlopen=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -9901,11 +10341,27 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_lib_dld_dld_link=yes
else
echo "$as_me: failed program was:" >&5
@@ -9914,7 +10370,7 @@
ac_cv_lib_dld_dld_link=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -9970,7 +10426,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9973 "configure"
+#line 10429 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10070,7 +10526,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10073 "configure"
+#line 10529 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11164,11 +11620,27 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_tr...
[truncated message content] |
|
From: <mh...@us...> - 2010-04-27 05:41:20
|
Revision: 11212
http://sbml.svn.sourceforge.net/sbml/?rev=11212&view=rev
Author: mhucka
Date: 2010-04-27 05:41:13 +0000 (Tue, 27 Apr 2010)
Log Message:
-----------
Testing was still screwed up when
attempting to build libSBML as a FAT binary with i386 + x86_64 on systems
like MacOS 10.5. I added new code to create the TestRunners as 32-bit
programs.
Modified Paths:
--------------
trunk/libsbml/config/makefile-common-actions.mk
Modified: trunk/libsbml/config/makefile-common-actions.mk
===================================================================
--- trunk/libsbml/config/makefile-common-actions.mk 2010-04-27 05:26:29 UTC (rev 11211)
+++ trunk/libsbml/config/makefile-common-actions.mk 2010-04-27 05:41:13 UTC (rev 11212)
@@ -382,11 +382,39 @@
# This depends on $(check_driver) and $(test_objfiles) to have been defined
# in the including Makefile.
+# 2010-04-26: if you build libSBML as a universal binary with x86_64 support
+# on MacOS 10.5, "make check" may fail because not all the libraries needed
+# by an executable are available in 64-bit form on the system. We have to
+# drop down to 32-bit in that case. Conversely, on 10.6, MacOS ships with
+# 64-bit binaries for (it seems) everything, and builds 64-bit executables
+# by default.
+
+filtered_cflags = $(shell echo '$(CFLAGS)' | sed -e "s/-arch x86_64//g")
+filtered_cppflags = $(shell echo '$(CPPFLAGS)' | sed -e "s/-arch x86_64//g")
+filtered_ldflags = $(shell echo '$(LDFLAGS)' | sed -e "s/-arch x86_64//g")
+
$(check_driver): $(test_objfiles)
- $(LIBTOOL) --mode=link $(CXX) $(extra_CPPFLAGS) $(extra_CXXFLAGS) $(default_includes) \
- $(CPPFLAGS) $(CFLAGS) $(INCLUDES) \
+ifndef USE_UNIVBINARY
+ $(LIBTOOL) --mode=link $(CXX) $(extra_CPPFLAGS) $(extra_CXXFLAGS) \
+ $(default_includes) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) \
$(test_objfiles) $(objfiles) $(extra_LDFLAGS) $(LDFLAGS) \
$(LIBS) $(extra_LIBS) -o $@
+else
+ @version=`uname -r | awk -F. '{print $$1}'`;\
+ if test $$version -ge 10; then \
+ cflags="$(CFLAGS)"; \
+ cppflags="$(CPPFLAGS)"; \
+ ldflags="$(LDFLAGS)"; \
+ else \
+ cflags="$(filtered_cflags)";\
+ cppflags="$(filtered_cppflags)";\
+ ldflags="$(filtered_ldflags)";\
+ fi; \
+ $(LIBTOOL) --mode=link $(CXX) $(extra_CPPFLAGS) $(extra_CXXFLAGS) \
+ $(default_includes) $$cppflags $$cflags $(INCLUDES) \
+ $(test_objfiles) $(objfiles) $(extra_LDFLAGS) $$ldflags \
+ $(LIBS) $(extra_LIBS) -o $@
+endif
run-checks: $(check_driver) $(libraries)
@echo
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mh...@us...> - 2010-04-27 05:26:35
|
Revision: 11211
http://sbml.svn.sourceforge.net/sbml/?rev=11211&view=rev
Author: mhucka
Date: 2010-04-27 05:26:29 +0000 (Tue, 27 Apr 2010)
Log Message:
-----------
Got tired of writing code to test for the MacOS version,
so I added a new variable MACOS_VERSION that's only defined on Macs.
Modified Paths:
--------------
trunk/libsbml/config/makefile-common-vars.mk.in
Modified: trunk/libsbml/config/makefile-common-vars.mk.in
===================================================================
--- trunk/libsbml/config/makefile-common-vars.mk.in 2010-04-27 04:21:38 UTC (rev 11210)
+++ trunk/libsbml/config/makefile-common-vars.mk.in 2010-04-27 05:26:29 UTC (rev 11211)
@@ -217,6 +217,11 @@
HOST_OS = @host_os@
HOST_TYPE = @HOST_TYPE@
HOST_CPU = @host_cpu@
+ifeq "$(HOST_TYPE)" "darwin"
+ MACOS_VERSION = $(shell sw_vers -productVersion | cut -d"." -f1,2)
+else
+ MACOS_VERSION =
+endif
INSTALL = @INSTALL@
INSTALL_SH = $(top_srcdir)/config/install-sh -c
LDFLAGS = @LDFLAGS@ @ZLIB_LDFLAGS@ @BZ2_LDFLAGS@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mh...@us...> - 2010-04-27 04:21:44
|
Revision: 11210
http://sbml.svn.sourceforge.net/sbml/?rev=11210&view=rev
Author: mhucka
Date: 2010-04-27 04:21:38 +0000 (Tue, 27 Apr 2010)
Log Message:
-----------
Old versions of swig seem to send the -version
output to standard error, not standard out. Modified the script to cope.
Modified Paths:
--------------
trunk/libsbml/config/chk_swig_version.sh.in
Modified: trunk/libsbml/config/chk_swig_version.sh.in
===================================================================
--- trunk/libsbml/config/chk_swig_version.sh.in 2010-04-27 02:59:35 UTC (rev 11209)
+++ trunk/libsbml/config/chk_swig_version.sh.in 2010-04-27 04:21:38 UTC (rev 11210)
@@ -25,7 +25,7 @@
ry=`echo $NEED | sed -e 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'`
rz=`echo $NEED | sed -e 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'`
-version=`"$SWIG" -version | tr -d '\015'`
+version=`"$SWIG" -version 2>&1`
sx=`echo $version | sed -e 's/SWIG Version \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'`
sy=`echo $version | sed -e 's/SWIG Version \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mh...@us...> - 2010-04-27 02:59:41
|
Revision: 11209
http://sbml.svn.sourceforge.net/sbml/?rev=11209&view=rev
Author: mhucka
Date: 2010-04-27 02:59:35 +0000 (Tue, 27 Apr 2010)
Log Message:
-----------
Updated for changes in univbinary.m4
Modified Paths:
--------------
trunk/libsbml/configure
Modified: trunk/libsbml/configure
===================================================================
--- trunk/libsbml/configure 2010-04-27 02:58:38 UTC (rev 11208)
+++ trunk/libsbml/configure 2010-04-27 02:59:35 UTC (rev 11209)
@@ -20036,7 +20036,7 @@
OSX_MAJOR_VER=`uname -r | awk -F. '{print }'`
if expr ${OSX_MAJOR_VER} \>= 10 | grep -q 1; then
- default_OPTS="-arch i386 -arch x86_64 -arch ppc -arch ppc64"
+ default_OPTS="-arch i386 -arch x86_64 -arch ppc"
elif expr ${OSX_MAJOR_VER} \>= 9 | grep -q 1; then
default_OPTS="-arch i386 -arch ppc"
fi
@@ -25883,7 +25883,7 @@
OSX_MAJOR_VER=`uname -r | awk -F. '{print }'`
if expr ${OSX_MAJOR_VER} \>= 10 | grep -q 1; then
- default_OPTS="-arch i386 -arch x86_64 -arch ppc -arch ppc64"
+ default_OPTS="-arch i386 -arch x86_64 -arch ppc"
elif expr ${OSX_MAJOR_VER} \>= 9 | grep -q 1; then
default_OPTS="-arch i386 -arch ppc"
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|