Menu
▾
▴
sbml-svn
|
From: <fbe...@us...> - 2011-08-25 01:26:32
|
Revision: 14312
http://sbml.svn.sourceforge.net/sbml/?rev=14312&view=rev
Author: fbergmann
Date: 2011-08-25 01:26:25 +0000 (Thu, 25 Aug 2011)
Log Message:
-----------
- fix a crash that would happen if a model could not be resolved, instead fail the conversion
Modified Paths:
--------------
branches/libsbml-packages/comp/src/sbml/packages/comp/util/CompFlatteningConverter.cpp
Modified: branches/libsbml-packages/comp/src/sbml/packages/comp/util/CompFlatteningConverter.cpp
===================================================================
--- branches/libsbml-packages/comp/src/sbml/packages/comp/util/CompFlatteningConverter.cpp 2011-08-24 22:34:04 UTC (rev 14311)
+++ branches/libsbml-packages/comp/src/sbml/packages/comp/util/CompFlatteningConverter.cpp 2011-08-25 01:26:25 UTC (rev 14312)
@@ -833,6 +833,7 @@
Submodel *current = plugin->getSubmodel(i);
Model* instantiatedModel = instantiateSubModel(current, modelDefinitions);
+ if (instantiatedModel == NULL) return LIBSBML_OPERATION_FAILED;
cleanupReplacements(model, instantiatedModel);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fbe...@us...> - 2012-12-13 20:31:17
|
Revision: 16579
http://sbml.svn.sourceforge.net/sbml/?rev=16579&view=rev
Author: fbergmann
Date: 2012-12-13 20:31:10 +0000 (Thu, 13 Dec 2012)
Log Message:
-----------
- need to set the base path, when the option is given
Modified Paths:
--------------
branches/libsbml-packages/comp/src/sbml/packages/comp/util/CompFlatteningConverter.cpp
Modified: branches/libsbml-packages/comp/src/sbml/packages/comp/util/CompFlatteningConverter.cpp
===================================================================
--- branches/libsbml-packages/comp/src/sbml/packages/comp/util/CompFlatteningConverter.cpp 2012-12-13 05:37:42 UTC (rev 16578)
+++ branches/libsbml-packages/comp/src/sbml/packages/comp/util/CompFlatteningConverter.cpp 2012-12-13 20:31:10 UTC (rev 16579)
@@ -116,9 +116,11 @@
return LIBSBML_OPERATION_SUCCESS;
}
- //string basePath = ".";
- //if (getProperties() != NULL)
- // basePath = getProperties()->getValue("basePath");
+ // need to set the base path if we have the option
+ if (getProperties() != NULL && getProperties()->hasOption("basePath"))
+ {
+ mDocument->setLocationURI(string("file:") + getProperties()->getValue("basePath"));
+ }
CompModelPlugin *modelPlugin = (CompModelPlugin*)(mModel->getPlugin("comp"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sar...@us...> - 2012-12-17 16:24:20
|
Revision: 16599
http://sbml.svn.sourceforge.net/sbml/?rev=16599&view=rev
Author: sarahkeating
Date: 2012-12-17 16:24:13 +0000 (Mon, 17 Dec 2012)
Log Message:
-----------
fixed typo
Modified Paths:
--------------
branches/libsbml-packages/comp/src/sbml/packages/comp/util/CompFlatteningConverter.cpp
Modified: branches/libsbml-packages/comp/src/sbml/packages/comp/util/CompFlatteningConverter.cpp
===================================================================
--- branches/libsbml-packages/comp/src/sbml/packages/comp/util/CompFlatteningConverter.cpp 2012-12-17 08:47:04 UTC (rev 16598)
+++ branches/libsbml-packages/comp/src/sbml/packages/comp/util/CompFlatteningConverter.cpp 2012-12-17 16:24:13 UTC (rev 16599)
@@ -275,7 +275,7 @@
{
if (unrecognised == true)
{
- if (required = true)
+ if (required == true)
{
//mDocument->getErrorLog()->logError(CompFlatteningNotRecognisedReqd, 3, 1);
// log error: unrecognised required package
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sar...@us...> - 2012-12-30 19:13:31
|
Revision: 16673
http://sbml.svn.sourceforge.net/sbml/?rev=16673&view=rev
Author: sarahkeating
Date: 2012-12-30 19:13:18 +0000 (Sun, 30 Dec 2012)
Log Message:
-----------
changed code to not use disabling packages to remove information
actually remove it !
Modified Paths:
--------------
branches/libsbml-packages/comp/src/sbml/packages/comp/util/CompFlatteningConverter.cpp
Modified: branches/libsbml-packages/comp/src/sbml/packages/comp/util/CompFlatteningConverter.cpp
===================================================================
--- branches/libsbml-packages/comp/src/sbml/packages/comp/util/CompFlatteningConverter.cpp 2012-12-30 18:34:19 UTC (rev 16672)
+++ branches/libsbml-packages/comp/src/sbml/packages/comp/util/CompFlatteningConverter.cpp 2012-12-30 19:13:18 UTC (rev 16673)
@@ -152,9 +152,20 @@
{
if (getLeaveDefinitions() == false)
{
- mDocument->disablePackage(CompExtension::getXmlnsL3V1V1(), "comp");
+ unsigned int i;
+ CompSBMLDocumentPlugin *docPlug =
+ static_cast<CompSBMLDocumentPlugin *>(mDocument->getPlugin("comp"));
+
+ for (i = docPlug->getNumModelDefinitions() - 1; i >= 0; i--)
+ {
+ docPlug->removeModelDefinition(i);
+ }
+ for (i = docPlug->getNumExternalModelDefinitions() - 1; i >= 0; i--)
+ {
+ docPlug->removeExternalModelDefinition(i);
+ }
+
result = mDocument->setModel(flatmodel);
- mDocument->enablePackage(CompExtension::getXmlnsL3V1V1(), "comp", true);
mDocument->setPackageRequired("comp", false);
}
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sar...@us...> - 2012-12-31 18:16:57
|
Revision: 16691
http://sbml.svn.sourceforge.net/sbml/?rev=16691&view=rev
Author: sarahkeating
Date: 2012-12-31 18:16:48 +0000 (Mon, 31 Dec 2012)
Log Message:
-----------
fixed index that needs to be signed
Modified Paths:
--------------
branches/libsbml-packages/comp/src/sbml/packages/comp/util/CompFlatteningConverter.cpp
Modified: branches/libsbml-packages/comp/src/sbml/packages/comp/util/CompFlatteningConverter.cpp
===================================================================
--- branches/libsbml-packages/comp/src/sbml/packages/comp/util/CompFlatteningConverter.cpp 2012-12-31 17:47:19 UTC (rev 16690)
+++ branches/libsbml-packages/comp/src/sbml/packages/comp/util/CompFlatteningConverter.cpp 2012-12-31 18:16:48 UTC (rev 16691)
@@ -152,7 +152,7 @@
{
if (getLeaveDefinitions() == false)
{
- unsigned int i;
+ int i;
CompSBMLDocumentPlugin *docPlug =
static_cast<CompSBMLDocumentPlugin *>(mDocument->getPlugin("comp"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X