Port improved comp flattening from eikept/jsbml and run tests#277
Port improved comp flattening from eikept/jsbml and run tests#277dyrpsf wants to merge 4 commits intosbmlteam:masterfrom
Conversation
|
Hi, this PR was automatically closed because I had to reset and clean up my branches while reverting recent changes. |
|
Hi everyone, Just a quick update: everything is now set and all issues have been resolved. The changes have been reapplied cleanly, and this PR, as well as all other PRs I previously mentioned with problems, are now in good shape. Feel free to review at your convenience. Thanks for your patience! |
draeger
left a comment
There was a problem hiding this comment.
Very good work. My remarks focus on declarations of some data types that could be more generic in a few places.
extensions/comp/src/org/sbml/jsbml/ext/comp/util/CompFlatteningConverter.java
Outdated
Show resolved
Hide resolved
extensions/comp/src/org/sbml/jsbml/ext/comp/util/CompFlatteningConverter.java
Outdated
Show resolved
Hide resolved
extensions/comp/src/org/sbml/jsbml/ext/comp/util/CompFlatteningConverter.java
Show resolved
Hide resolved
extensions/comp/src/org/sbml/jsbml/ext/comp/util/CompFlatteningConverter.java
Outdated
Show resolved
Hide resolved
extensions/comp/src/org/sbml/jsbml/ext/comp/util/CompFlatteningConverter.java
Outdated
Show resolved
Hide resolved
|
Hi @draeger , I have refactored I noticed that The project compiles successfully, though some existing network-related timeouts persist in Thanks! |
This PR addresses part of #251 by porting the improved comp flattening implementation
from the
eikept/jsbmlfork and wiring it into the currentjsbml-compmodule.Main changes
CompFlatteningConverterwith the version from theeikept/jsbmlfork,which provides a more complete flattening implementation for the comp package
(including proper handling of ReplacedElement/Deletion chains, conversion factors,
and nested submodels).
CompFlatteningIDExpanderCompFlatteningIDExpanderTSmergeModelsmethod to merge the “current” (parent) model beforethe previously-flattened submodels. This preserves the original parameter ordering,
so that flattened output matches the existing
testFlattening/testN_flat.xmlexpectations (e.g. for test6).
Testing
From this branch I ran:
Results:
testSpecificFile and the individual flattening/internalisation tests now pass for the local testFlattening and testGathering data.
testAllData now exercises the full testFlattening suite; there is still one mismatch reported via Success Testing Model (this was previously flagged in the test with a TODO comment).
testInternaliseExternalModelDefinitions_online still errors due to the remote URL (https://sbmlteam.github.io/jsbml/test/data/comp/simple_online_url.xml) returning a 301 HTML redirect instead of SBML; this looks like a test-data/ hosting issue rather than an algorithm problem.
I’ve kept those two behaviours unchanged but can help adjust the tests if you
prefer (e.g. updating the URL to a raw SBML resource or marking the online test
as integration-only).