Commit 931fe08b authored by Piotr Gawron's avatar Piotr Gawron

Merge branch 'gpml-mapping-change' into 'master'

mapping modified - input arrow is translated into reactant not a modulation

See merge request !993
parents e3faa81c 9cfcdbaa
Pipeline #16176 passed with stage
in 13 minutes and 25 seconds
...@@ -38,7 +38,7 @@ public enum InteractionMapping { ...@@ -38,7 +38,7 @@ public enum InteractionMapping {
*/ */
ARROW(GpmlInteractionType.ARROW, GpmlLineType.SOLID, ARROW(GpmlInteractionType.ARROW, GpmlLineType.SOLID,
StateTransitionReaction.class, false, StateTransitionReaction.class, false,
Modulation.class, true, Reactant.class, false,
Product.class, false), Product.class, false),
/** /**
...@@ -111,7 +111,7 @@ public enum InteractionMapping { ...@@ -111,7 +111,7 @@ public enum InteractionMapping {
*/ */
CONVERSION(GpmlInteractionType.CONVERSION, GpmlLineType.SOLID, CONVERSION(GpmlInteractionType.CONVERSION, GpmlLineType.SOLID,
StateTransitionReaction.class, false, StateTransitionReaction.class, false,
Modulation.class, true, Reactant.class, false,
Product.class, false), Product.class, false),
/** /**
......
...@@ -81,11 +81,11 @@ public class ReactionGpmlInputToModelTest extends WikipathwaysTestFunctions { ...@@ -81,11 +81,11 @@ public class ReactionGpmlInputToModelTest extends WikipathwaysTestFunctions {
assertTrue(modifier instanceof Modulation); assertTrue(modifier instanceof Modulation);
} }
assertNull(reactant); assertNotNull(reactant);
assertNull(product); assertNull(product);
assertNotNull(modifier); assertNull(modifier);
assertEquals(1, getWarnings().size()); assertEquals(0, getWarnings().size());
Model model2 = serializeModelOverCellDesignerParser(model1); Model model2 = serializeModelOverCellDesignerParser(model1);
...@@ -291,11 +291,11 @@ public class ReactionGpmlInputToModelTest extends WikipathwaysTestFunctions { ...@@ -291,11 +291,11 @@ public class ReactionGpmlInputToModelTest extends WikipathwaysTestFunctions {
assertTrue(modifier instanceof Modulation); assertTrue(modifier instanceof Modulation);
} }
assertNull(reactant); assertNotNull(reactant);
assertNull(product); assertNull(product);
assertNotNull(modifier); assertNull(modifier);
assertEquals(1, getWarnings().size()); assertEquals(0, getWarnings().size());
Model model2 = serializeModelOverCellDesignerParser(model1); Model model2 = serializeModelOverCellDesignerParser(model1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment