1.1 --- a/isac-java/src/java-tests/isac/bridge/TestPIDE.java Mon Aug 03 14:51:28 2015 +0200
1.2 +++ b/isac-java/src/java-tests/isac/bridge/TestPIDE.java Fri Aug 07 08:07:47 2015 +0200
1.3 @@ -122,7 +122,7 @@
1.4 Position to = new Position();
1.5 to.setKind("Pbl");
1.6 int level = 0;
1.7 - String rules = "false";
1.8 + boolean rules = false;
1.9 XML.Tree GET_FORMULAE_out = sys.invoke(Operations.GET_FORMULAE,
1.10 JavaToIsa.get_formulae(new scala.math.BigInt(BigInteger.valueOf(calcid)),
1.11 from, to, new scala.math.BigInt(BigInteger.valueOf(level)), rules));
1.12 @@ -160,8 +160,6 @@
1.13 assertEquals(spec.getProblem().toSMLString(), "[\"e_pblID\"]");
1.14 assertEquals(spec.getMethod().toSMLString(), "[\"e_metID\"]");
1.15
1.16 - //=========================================
1.17 -
1.18 System.out.println("# 6 # " + REF_FORMULA_out);
1.19
1.20 //----- step 7 ----------------------------------------------------------------
2.1 --- a/isac-java/src/java/isac/bridge/xml/JavaToIsa.scala Mon Aug 03 14:51:28 2015 +0200
2.2 +++ b/isac-java/src/java/isac/bridge/xml/JavaToIsa.scala Fri Aug 07 08:07:47 2015 +0200
2.3 @@ -91,13 +91,13 @@
2.4
2.5 //def get_formulae(calcid: scala.math.BigInt, from: ICalcIterator,to: ICalcIterator,
2.6 def get_formulae(calcid: scala.math.BigInt, from: Position, to: Position,
2.7 - level: scala.math.BigInt, rules/*?*/: String): XML.Tree =
2.8 + level: scala.math.BigInt, rules: Boolean): XML.Tree =
2.9 { XML.Elem(Markup("GETFORMULAEFROMTO", Nil), List(
2.10 XML.Elem(Markup("CALCID", Nil), List(XML.Text(calcid.toString()))),
2.11 xml_of_Position(from),
2.12 xml_of_Position(to),
2.13 XML.Elem(Markup("INT", Nil), List(XML.Text(level.toString()))),
2.14 - XML.Elem(Markup("BOOL", Nil), List(XML.Text(rules)))))
2.15 + XML.Elem(Markup("BOOL", Nil), List(XML.Text(rules.toString)))))
2.16 }
2.17
2.18 //----- step 6 -----------------------