testmodel update

Gebbi8 · May 1, 2020 · baaa50e · baaa50e
1 parent 98a022a
commit baaa50e
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 14 deletions.
diff --git a/index.html b/index.html
@@ -34,6 +34,8 @@ <h1> Select two model versions </h1>
 					<select id="versionChoice" class="box" size="10">
 						<optgroup label="Test Fake Models">
 							<option class="opt" value="test">allGlyphsAndArcs</option>
+							<option class="opt" value="test">GlyphsAndArcs</option>
+							<option class="opt" value="test">GlyphsAndArcs_noTypo</option>
 						</optgroup>
 						<optgroup label="PK Cycle">
 							<option class="opt" value="test">model_MOR_AC</option>
@@ -261,15 +263,15 @@ <h1>Selection</h1>
 
 		var x = document.getElementById("selection");
 		var option = document.createElement("option");
-		option.text = "allGlyphsAndArcs";
+		option.text = "GlyphsAndArcs_noTypo";
 		x.add(option);
 		option = document.createElement("option");
-		option.text = "multiple";
+		option.text = "GlyphsAndArcs_noTypo";
 		x.add(option);
 
 		getBivesData(
-			"http://hopper.informatik.uni-rostock.de/GitRepos/DiVil/testModels/" + "allGlyphsAndArcs" + ".xml",
-			"http://hopper.informatik.uni-rostock.de/GitRepos/DiVil/testModels/" + "allGlyphsAndArcs" + ".xml",
+			"http://hopper.informatik.uni-rostock.de/GitRepos/DiVil/testModels/" + "GlyphsAndArcs_noTypo" + ".xml",
+			"http://hopper.informatik.uni-rostock.de/GitRepos/DiVil/testModels/" + "GlyphsAndArcs_noTypo" + ".xml",
 			["reportHtml", "reactionsSbgnJson", "xmlDiff", "separateAnnotations"]);
 	</script>
 </body>

diff --git a/javascriptAndCss/showSbgn.js b/javascriptAndCss/showSbgn.js
@@ -10,7 +10,7 @@ function showSbgn(data) {
 	obj = JSON.parse(data);
 	nodes = obj.nodes;
 	links = obj.links;
-	console.log(links);
+	console.log(nodes);
 
 	//////same source/link combination/////
 

diff --git a/testModels/GlyphsAndArcs.xml b/testModels/GlyphsAndArcs.xml
@@ -7,15 +7,15 @@
 		</listOfCompartments>
 		<listOfSpecies>
 			<species id="x" name="unspecEnt" compartment="compartment1" initialConcentration="0"/>
-			<species id="mac" name="macroMolecule" compartment="compartment1" initialConcentration="0" sbo="SBO:0000248"/>
-			<species id="nuc" name="nucleicAcidFeat" compartment="compartment1" initialConcentration="0" sbo="SBO:0000250"/>
-			<species id="sim" name="simpleChem" compartment="compartment1" initialConcentration="0" sbo="SBO:0000247"/>
-			<species id="com" name="complex" compartment="compartment1" initialConcentration="0" sbo="SBO:0000248"/>
-			<species id="pert" name="pertubingAgent" compartment="compartment1" initialConcentration="0" sbo="SBO:0000405"/>
-			<species id="macMulti" name="mac multimer" compartment="compartment1" initialConcentration="0" sbo="SBO:0000420"/>
-			<species id="simMulti" name="simple Multimer" compartment="compartment1" initialConcentration="0" sbo="SBO:0000421"/>
-			<species id="nucMulti" name="nucMulti" compartment="compartment1" initialConcentration="0" sbo="SBO:0000419"/>
-			<species id="compMulti" name="compMulti" compartment="compartment1" initialConcentration="0" sbo="SBO:0000418"/>
+			<species id="mac" name="macroMolecule" compartment="compartment1" initialConcentration="0" sboTerm="SBO:0000248"/>
+			<species id="nuc" name="nucleicAcidFeat" compartment="compartment1" initialConcentration="0" sboTerm="SBO:0000250"/>
+			<species id="sim" name="simpleChem" compartment="compartment1" initialConcentration="0" sboTerm="SBO:0000247"/>
+			<species id="com" name="complex" compartment="compartment1" initialConcentration="0" sboTerm="SBO:0000248"/>
+			<species id="pert" name="pertubingAgent" compartment="compartment1" initialConcentration="0" sboTerm="SBO:0000405"/>
+			<species id="macMulti" name="mac multimer" compartment="compartment1" initialConcentration="0" sboTerm="SBO:0000420"/>
+			<species id="simMulti" name="simple Multimer" compartment="compartment1" initialConcentration="0" sboTerm="SBO:0000421"/>
+			<species id="nucMulti" name="nucMulti" compartment="compartment1" initialConcentration="0" sboTerm="SBO:0000419"/>
+			<species id="compMulti" name="compMulti" compartment="compartment1" initialConcentration="0" sboTerm="SBO:0000418"/>
 		</listOfSpecies>
 		<listOfReactions>
 			<reaction id="v1" name="sigb syn">

diff --git a/testModels/GlyphsAndArcs_noTypo.xml b/testModels/GlyphsAndArcs_noTypo.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created by JWS2SBML on 2011/04/04 15:53:02-->
+<sbml xmlns="http://www.sbml.org/sbml/level2/version4" level="2" version="4">
+	<model name="BSA">
+		<listOfCompartments>
+			<compartment id="compartment1" name="compartment" size="1"/>
+		</listOfCompartments>
+		<listOfSpecies>
+			<species id="x" name="unspecEnt" compartment="compartment1" initialConcentration="0"/>
+			<species id="mac" name="macroMolecule" compartment="compartment1" initialConcentration="0" sboTerm="SBO:0000248"/>
+			<species id="nuc" name="nucleicAcidFeat" compartment="compartment1" initialConcentration="0" sboTerm="SBO:0000250"/>
+			<species id="sim" name="simpleChem" compartment="compartment1" initialConcentration="0" sboTerm="SBO:0000247"/>
+			<species id="com" name="complex" compartment="compartment1" initialConcentration="0" sboTerm="SBO:0000248"/>
+			<species id="pert" name="pertubingAgent" compartment="compartment1" initialConcentration="0" sboTerm="SBO:0000405"/>
+			<species id="macMulti" name="mac multimer" compartment="compartment1" initialConcentration="0" sboTerm="SBO:0000420"/>
+			<species id="simMulti" name="simple Multimer" compartment="compartment1" initialConcentration="0" sboTerm="SBO:0000421"/>
+			<species id="nucMulti" name="nucMulti" compartment="compartment1" initialConcentration="0" sboTerm="SBO:0000419"/>
+			<species id="compMulti" name="compMulti" compartment="compartment1" initialConcentration="0" sboTerm="SBO:0000418"/>
+		</listOfSpecies>
+		<listOfReactions>
+			<reaction id="v1" name="sigb syn">
+				<listOfProducts>
+					<speciesReference species="x"/>
+				</listOfProducts>
+				<listOfModifiers>
+					<modifierSpeciesReference species="mac"/>
+				</listOfModifiers>
+			</reaction>
+			<reaction id="v2" name="lacz syn">
+				<listOfProducts>
+					<speciesReference species="mac"/>
+				</listOfProducts>
+				<listOfModifiers>
+					<modifierSpeciesReference species="compMulti"/>
+				</listOfModifiers>
+			</reaction>
+			<reaction id="v3" name="x syn">
+				<listOfProducts>
+					<speciesReference species="compMulti"/>
+				</listOfProducts>
+			</reaction>
+			<reaction id="v4" name="sigb degr">
+				<listOfReactants>
+					<speciesReference species="pert"/>
+				</listOfReactants>
+			</reaction>
+			<reaction id="v5" name="lacz degr">
+				<listOfReactants>
+					<speciesReference species="com"/>
+				</listOfReactants>
+				<listOfModifiers>
+					<modifierSpeciesReference species="nuc"/>
+				</listOfModifiers>
+			</reaction>
+		</listOfReactions>
+		</model>
+</sbml>