=================================================================== RCS file: /home/cvs/OpenXM/src/OpenMath/PolyCalc.java,v retrieving revision 1.6 retrieving revision 1.11 diff -u -p -r1.6 -r1.11 --- OpenXM/src/OpenMath/PolyCalc.java 1999/11/10 21:25:48 1.6 +++ OpenXM/src/OpenMath/PolyCalc.java 2000/10/11 08:32:13 1.11 @@ -1,5 +1,5 @@ /** - * $OpenXM: OpenXM/src/OpenMath/PolyCalc.java,v 1.5 1999/11/02 15:58:11 tam Exp $ + * $OpenXM: OpenXM/src/OpenMath/PolyCalc.java,v 1.10 2000/04/02 19:24:40 tam Exp $ */ import JP.ac.kobe_u.math.tam.OpenXM.*; @@ -119,20 +119,10 @@ class PolyCalc extends Applet implements ActionListene public void run(){ // for debug try{ while(true){ - CMO tmp; + OXmessage tmp = oxm.receive(); + textarea.append("=> "+ tmp +"\n"); Thread.yield(); - - switch(oxm.receiveOXtag()){ - case OpenXM.OX_COMMAND: - oxm.receiveSM(); - break; - - case OpenXM.OX_DATA: - tmp = oxm.receiveCMO(); - textarea.append("=> "+ tmp +"\n"); - break; - } } }catch(java.io.IOException e){} } @@ -146,10 +136,12 @@ class PolyCalc extends Applet implements ActionListene }else if(arg.equals("grobner base")){ try{ debug("poly A: "+ poly1.getText()); - oxm.sendCMO(new CMO_STRING("[[("+ poly1.getText() +") ("+ poly2.getText() +")] (x,y)] gb")); - oxm.sendSM(new SM(SM.SM_executeStringByLocalParser)); - oxm.sendSM(new SM(SM.SM_popString)); - }catch(java.io.IOException e){} + oxm.send(new CMO_STRING("[[("+ poly1.getText() +") ("+ poly2.getText() +")] (x,y)] gb")); + oxm.send(new SM(SM.SM_executeStringByLocalParser)); + oxm.send(new SM(SM.SM_popString)); + }catch(java.io.IOException e){ + }catch(MathcapViolation e){ + } } /* if ("first".equals(arg)) { @@ -171,22 +163,28 @@ class PolyCalc extends Applet implements ActionListene +"("+ ControlPort +","+ DataPort +")\n"); try{ + /* + Runtime r = Runtime.getRuntime(); + + r.exec("ox -ox ox_sm1"); + */ oxm = new OpenXM(host,ControlPort,DataPort); textarea.append("Connected.\n"); - oxm.sendCMO(new CMO_STRING("(cohom.sm1) run ;\n")); - oxm.sendSM(new SM(SM.SM_executeStringByLocalParser)); + oxm.send(new CMO_STRING("(cohom.sm1) run ;\n")); + oxm.send(new SM(SM.SM_executeStringByLocalParser)); thread = new Thread(this); thread.start(); }catch(java.io.IOException e){ textarea.append("failed.\n"); stop(); + }catch(MathcapViolation e){ } } private void debug(String str){ if(debug){ - System.out.println(str); + System.err.println(str); } } @@ -213,7 +211,7 @@ class PolyCalc extends Applet implements ActionListene for(int i=0;i