Menu
▾
▴
[Jason-developers] SF.net SVN: jason:[1752] trunk
|
From: <jom...@us...> - 2013-10-21 13:52:28
|
Revision: 1752
http://sourceforge.net/p/jason/svn/1752
Author: jomifred
Date: 2013-10-21 13:52:25 +0000 (Mon, 21 Oct 2013)
Log Message:
-----------
fix minor bug in console
Modified Paths:
--------------
trunk/build.xml
trunk/lib/UmlGraph.jar
trunk/release-notes.txt
trunk/src/jason/asSemantics/TransitionSystem.java
trunk/src/jason/runtime/MASConsoleColorGUI.java
trunk/src/jason/runtime/MASConsoleGUI.java
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2013-10-19 19:37:16 UTC (rev 1751)
+++ trunk/build.xml 2013-10-21 13:52:25 UTC (rev 1752)
@@ -12,7 +12,7 @@
<property name="dist.properties" value="${basedir}/bin/dist.properties" />
<property name="version" value="1" />
- <property name="release" value="3.10a" />
+ <property name="release" value="3.10b" />
<property name="distDir" value="${env.HOME}/tmp/x/Jason-${version}.${release}" />
<property name="distFile" value="${env.HOME}/Jason-${version}.${release}" />
@@ -255,7 +255,7 @@
</not>
</condition>
- <target name="apidocsimple" unless="dot-ok" > <!-- stylesheetfile="doc/faq/faq.css" -->
+ <target name="apidocsimple" unless="dot-ok"> <!-- -->
<javadoc
destdir="${basedir}/doc/api"
packagenames="jason.*"
@@ -291,9 +291,9 @@
<param name="-qualify"/>
<!--param name="-collapsible"/-->
<param name="-postfixpackage"/>
- <param name="-nodefontsize" value="14"/>
- <param name="-nodefontpackagesize" value="8"/>
- <param name="-edgefontsize" value="10"/>
+ <!--param name="-nodefontsize" value="14"/-->
+ <!--param name="-nodefontpackagesize" value="8"/-->
+ <!--param name="-edgefontsize" value="10"/-->
<!--param name="-link" value="http://java.sun.com/j2se/1.5.0/docs/guide/javadoc/doclet/spec"/>
<param name="-link" value="http://java.sun.com/j2se/1.5/docs/api"/-->
</doclet>
Modified: trunk/lib/UmlGraph.jar
===================================================================
(Binary files differ)
Modified: trunk/release-notes.txt
===================================================================
--- trunk/release-notes.txt 2013-10-19 19:37:16 UTC (rev 1751)
+++ trunk/release-notes.txt 2013-10-21 13:52:25 UTC (rev 1752)
@@ -1,7 +1,7 @@
---------------------------
version 1.3.10b
-revision 1748 on SVN
+revision 1750 on SVN
---------------------------
New features
Modified: trunk/src/jason/asSemantics/TransitionSystem.java
===================================================================
--- trunk/src/jason/asSemantics/TransitionSystem.java 2013-10-19 19:37:16 UTC (rev 1751)
+++ trunk/src/jason/asSemantics/TransitionSystem.java 2013-10-21 13:52:25 UTC (rev 1752)
@@ -579,28 +579,16 @@
PlanBody h = im.getCurrentStep();
Term bTerm = h.getBodyTerm();
- // de-var bTerm
- //while (bTerm instanceof VarTerm) {
- if (bTerm instanceof VarTerm) {
- // check if bTerm is ground
- /*if (((VarTerm)bTerm).hasValue()) {
- bTerm = ((VarTerm)bTerm).getValue();
- continue; // restart the loop
- }*/
-
- // h should be 'groundable' (considering the current unifier)
+
+ if (bTerm instanceof VarTerm) { // de-var bTerm
bTerm = bTerm.clone(); // clone before apply
bTerm.apply(u);
- //Term bValue = u.get((VarTerm)bTerm);
- //System.out.println("*** "+bTerm+"="+bValue+" "+bTerm.isGround()+" "+u);
- //if (bValue == null) { // the case of !A with A not ground
if (bTerm.isVar()) { // the case of !A with A not ground
String msg = h.getSrcInfo()+": "+ "Variable '"+bTerm+"' must be ground.";
if (!generateGoalDeletion(conf.C.SI, JasonException.createBasicErrorAnnots("body_var_without_value", msg)))
logger.log(Level.SEVERE, msg);
return;
}
- //if (bValue.isPlanBody()) {
if (bTerm.isPlanBody()) {
if (h.getBodyType() != BodyType.action) { // the case of ...; A = { !g }; +g; ....
String msg = h.getSrcInfo()+": "+ "The operator '"+h.getBodyType()+"' is lost with the variable '"+bTerm+"' unified with a plan body. ";
@@ -608,24 +596,16 @@
logger.log(Level.SEVERE, msg);
return;
}
- //h = (PlanBody)bValue;
h = (PlanBody)bTerm;
if (h.getPlanSize() > 1) { // the case of A unified with {a;b;c}
h.add(im.getCurrentStep().getBodyNext());
im.insertAsNextStep(h.getBodyNext());
}
bTerm = h.getBodyTerm();
- } else {
- ListTerm annots = ((VarTerm)bTerm).getAnnots();
- //bTerm = bValue;
- if (bTerm.isLiteral() && annots != null) {
- bTerm = ((Literal)bTerm).forceFullLiteralImpl();
- ((Literal)bTerm).addAnnots(annots);
- }
}
}
- Literal body = null;
+ Literal body = null;
if (bTerm instanceof Literal)
body = (Literal)bTerm;
Modified: trunk/src/jason/runtime/MASConsoleColorGUI.java
===================================================================
--- trunk/src/jason/runtime/MASConsoleColorGUI.java 2013-10-19 19:37:16 UTC (rev 1751)
+++ trunk/src/jason/runtime/MASConsoleColorGUI.java 2013-10-21 13:52:25 UTC (rev 1752)
@@ -94,7 +94,7 @@
int l = output.getDocument().getLength();
if (l > 60000) {
cleanConsole();
- // l = output.getDocument().getLength();
+ l = 0;
}
synchronized (this) {
output.append(c, s);
Modified: trunk/src/jason/runtime/MASConsoleGUI.java
===================================================================
--- trunk/src/jason/runtime/MASConsoleGUI.java 2013-10-19 19:37:16 UTC (rev 1751)
+++ trunk/src/jason/runtime/MASConsoleGUI.java 2013-10-21 13:52:25 UTC (rev 1752)
@@ -206,7 +206,7 @@
int l = output.getDocument().getLength();
if (l > 60000) {
cleanConsole();
- // l = output.getDocument().getLength();
+ l = 0;
}
synchronized (this) {
output.append(s);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
