Skip to content

serialization bug in java native #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"

[tool.poetry]
name = "libvcell"
version = "0.0.12"
version = "0.0.13"
description = "This is a python package which wraps a subset of VCell Java code as a native python package."
authors = ["Jim Schaff <schaff@uchc.edu>", "Ezequiel Valencia <evalencia@uchc.edu>"]
repository = "https://github.com/virtualcell/libvcell"
Expand Down
3 changes: 3 additions & 0 deletions vcell-native/src/main/java/org/vcell/libvcell/ModelUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public static void sbml_to_vcml(String sbml_content, Path vcmlPath)

GeometrySpec.avoidAWTImageCreation = true;
VCMongoMessage.enabled = false;
XmlHelper.cloneUsingXML = true;

record LoggerMessage(VCLogger.Priority priority, VCLogger.ErrorType errorType, String message) {};
final ArrayList<LoggerMessage> messages = new ArrayList<>();
Expand Down Expand Up @@ -76,6 +77,7 @@ public static void vcml_to_sbml(String vcml_content, String applicationName, Pat
throws XmlParseException, IOException, XMLStreamException, SbmlException, MappingException, ImageException, GeometryException, ExpressionException {
GeometrySpec.avoidAWTImageCreation = true;
VCMongoMessage.enabled = false;
XmlHelper.cloneUsingXML = true;

BioModel bioModel = XmlHelper.XMLToBioModel(new XMLSource(vcml_content));
bioModel.updateAll(false);
Expand Down Expand Up @@ -115,6 +117,7 @@ public static void vcml_to_sbml(String vcml_content, String applicationName, Pat
public static void vcml_to_vcml(String vcml_content, Path vcmlPath) throws XmlParseException, IOException, MappingException {
GeometrySpec.avoidAWTImageCreation = true;
VCMongoMessage.enabled = false;
XmlHelper.cloneUsingXML = true;

BioModel bioModel = XmlHelper.XMLToBioModel(new XMLSource(vcml_content));
bioModel.updateAll(false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ public class SolverUtils {
public static void vcmlToFiniteVolumeInput(String vcml_content, String simulation_name, File parentDir, File outputDir) throws XmlParseException, MappingException, SolverException, ExpressionException, MathException {
GeometrySpec.avoidAWTImageCreation = true;
VCMongoMessage.enabled = false;
XmlHelper.cloneUsingXML = true;

if (vcml_content.substring(0, 300).contains("<sbml xmlns=\"http://www.sbml.org/sbml")) {
throw new IllegalArgumentException("expecting VCML content, not SBML");
}
Expand Down Expand Up @@ -134,6 +136,8 @@ private static FieldDataIdentifierSpec[] getFieldDataIdentifierSpecs(Simulation
public static void sbmlToFiniteVolumeInput(String sbml_content, File outputDir) throws MappingException, PropertyVetoException, SolverException, ExpressionException, VCLoggerException {
GeometrySpec.avoidAWTImageCreation = true;
VCMongoMessage.enabled = false;
XmlHelper.cloneUsingXML = true;

SBMLExporter.MemoryVCLogger vcl = new SBMLExporter.MemoryVCLogger();
boolean bValidateSBML = true;
// input stream from sbml_content String
Expand Down
2 changes: 1 addition & 1 deletion vcell_submodule
Submodule vcell_submodule updated 40 files
+2 −2 vcell-client/src/main/java/cbit/vcell/client/ClientRequestManager.java
+2 −1 vcell-client/src/main/java/cbit/vcell/client/task/RunSims.java
+1 −1 vcell-client/src/main/java/cbit/vcell/geometry/gui/SurfaceViewer.java
+19 −59 vcell-client/src/main/java/cbit/vcell/graph/gui/BioCartoonTool.java
+19 −28 vcell-core/src/main/java/cbit/vcell/biomodel/BioModel.java
+11 −0 vcell-core/src/main/java/cbit/vcell/bionetgen/BNGMolecule.java
+45 −0 vcell-core/src/main/java/cbit/vcell/bionetgen/BNGOutputSpec.java
+4 −0 vcell-core/src/main/java/cbit/vcell/bionetgen/BNGParameter.java
+18 −0 vcell-core/src/main/java/cbit/vcell/bionetgen/BNGReaction.java
+16 −0 vcell-core/src/main/java/cbit/vcell/bionetgen/BNGReactionRule.java
+9 −1 vcell-core/src/main/java/cbit/vcell/bionetgen/BNGSpecies.java
+11 −0 vcell-core/src/main/java/cbit/vcell/bionetgen/BNGSpeciesComponent.java
+15 −0 vcell-core/src/main/java/cbit/vcell/bionetgen/ObservableGroup.java
+15 −61 vcell-core/src/main/java/cbit/vcell/clientdb/ClientDocumentManager.java
+1 −1 vcell-core/src/main/java/cbit/vcell/geometry/surface/AbstractPolygon.java
+6 −0 vcell-core/src/main/java/cbit/vcell/geometry/surface/FastSurface.java
+10 −0 vcell-core/src/main/java/cbit/vcell/geometry/surface/OrigSurface.java
+2 −0 vcell-core/src/main/java/cbit/vcell/geometry/surface/Polygon.java
+4 −0 vcell-core/src/main/java/cbit/vcell/geometry/surface/Quadrilateral.java
+3 −1 vcell-core/src/main/java/cbit/vcell/geometry/surface/Triangle.java
+4 −2 vcell-core/src/main/java/cbit/vcell/mapping/LegacySimContextTransformer.java
+6 −4 vcell-core/src/main/java/cbit/vcell/mapping/NetworkTransformer.java
+8 −59 vcell-core/src/main/java/cbit/vcell/mapping/RateRuleTransformer.java
+19 −52 vcell-core/src/main/java/cbit/vcell/mapping/RulebasedTransformer.java
+18 −0 vcell-core/src/main/java/cbit/vcell/math/JumpCondition.java
+5 −5 vcell-core/src/main/java/cbit/vcell/math/MathDescription.java
+1 −1 vcell-core/src/main/java/cbit/vcell/simdata/SimulationData.java
+4 −0 vcell-core/src/main/java/cbit/vcell/solver/AnnotatedFunction.java
+13 −43 vcell-core/src/main/java/cbit/vcell/solver/test/MathTestingUtilities.java
+21 −92 vcell-core/src/main/java/cbit/vcell/solvers/FiniteVolumeFileWriter.java
+7 −7 vcell-core/src/main/java/cbit/vcell/solvers/MovingBoundarySolver.java
+80 −25 vcell-core/src/main/java/cbit/vcell/xml/XmlHelper.java
+2 −2 vcell-core/src/main/java/cbit/vcell/xml/Xmlproducer.java
+16 −34 vcell-core/src/main/java/org/vcell/optimization/OptXmlWriter.java
+7 −6 vcell-core/src/main/java/org/vcell/sbml/vcell/SBMLImporter.java
+20 −82 vcell-core/src/main/java/org/vcell/solver/smoldyn/SmoldynFileWriter.java
+16 −41 vcell-core/src/main/java/org/vcell/solver/smoldyn/SmoldynSurfaceTessellator.java
+5 −2 vcell-core/src/test/java/org/vcell/sbml/BMDB_SBMLImportTest.java
+16 −1 vcell-math/src/main/java/cbit/vcell/parser/Expression.java
+1 −1 vcell-server/src/main/java/cbit/vcell/modeldb/ServerDocumentManager.java