pfc-prolog-cvs

[<iva...@us...>]

Update of /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/dummy
In directory sc8-pr-cvs1:/tmp/cvs-serv28131/src/org/asturlinux/frade/dummy

Modified Files:
	PrologContextDummy.java 
Log Message:
Updated dummy interpreter

Index: PrologContextDummy.java
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/src/org/asturlinux/frade/dummy/PrologContextDummy.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PrologContextDummy.java	20 Jul 2003 19:01:03 -0000	1.2
--- PrologContextDummy.java	27 Jul 2003 13:40:15 -0000	1.3
***************
*** 30,34 ****
  {
  
!     private int stepCounter = 1;
  
      private boolean loaded;
--- 30,34 ----
  {
  
!     private int _stepCounter = 1;
  
      private boolean loaded;
***************
*** 72,78 ****
  	 */
  
! 	if (stepCounter == 1)
  	    {
! 		stepCounter++;
  		return result;
  	    }
--- 72,78 ----
  	 */
  
! 	if (_stepCounter == 1)
  	    {
! 		_stepCounter++;
  		return result;
  	    }
***************
*** 88,94 ****
  	result.setNextLevelElements(resultSons);
  
! 	if (stepCounter == 2)
  	    {
! 		stepCounter++;
  		return result;
  	    }
--- 88,94 ----
  	result.setNextLevelElements(resultSons);
  
! 	if (_stepCounter == 2)
  	    {
! 		_stepCounter++;
  		return result;
  	    }
***************
*** 104,110 ****
  	node1.setNextLevelElements(node1Sons);
  
! 	if (stepCounter == 3)
  	    {
! 		stepCounter++;
  		return result;
  	    }
--- 104,110 ----
  	node1.setNextLevelElements(node1Sons);
  
! 	if (_stepCounter == 3)
  	    {
! 		_stepCounter++;
  		return result;
  	    }
***************
*** 117,127 ****
  	node3.setParent(node2);
  	node3.setSolution(true);
  	
  	TreeElementDummy[] node2Sons = {node3};
  	node2.setNextLevelElements(node2Sons);
  
! 	if (stepCounter == 4)
  	    {
! 		stepCounter++;
  		return result;
  	    }
--- 117,128 ----
  	node3.setParent(node2);
  	node3.setSolution(true);
+ 	node3.setCompletlyExplored(true);
  	
  	TreeElementDummy[] node2Sons = {node3};
  	node2.setNextLevelElements(node2Sons);
  
! 	if (_stepCounter == 4)
  	    {
! 		_stepCounter++;
  		return result;
  	    }
***************
*** 134,144 ****
  	node4.setParent(node2);
  	node4.setSolution(true);
  		
  	TreeElementDummy[] node2SonsNow = {node3,node4};
  	node2.setNextLevelElements(node2SonsNow);
  
! 	if (stepCounter == 5)
  	    {
! 		stepCounter++;
  		return result;
  	    }
--- 135,148 ----
  	node4.setParent(node2);
  	node4.setSolution(true);
+ 	node4.setCompletlyExplored(true);
  		
  	TreeElementDummy[] node2SonsNow = {node3,node4};
  	node2.setNextLevelElements(node2SonsNow);
+ 	//FIXME now or next step?
+ 	node2.setCompletlyExplored(true);
  
! 	if (_stepCounter == 5)
  	    {
! 		_stepCounter++;
  		return result;
  	    }
***************
*** 154,160 ****
  	node1.setNextLevelElements(node1SonsNow);
  
! 	if (stepCounter == 6)
  	    {
! 		stepCounter++;
  		return result;
  	    }
--- 158,164 ----
  	node1.setNextLevelElements(node1SonsNow);
  
! 	if (_stepCounter == 6)
  	    {
! 		_stepCounter++;
  		return result;
  	    }
***************
*** 167,177 ****
  	node6.setParent(node5);
  	node6.setSolution(true);
  
  	TreeElementDummy[] node5Sons = {node6};
  	node5.setNextLevelElements(node5Sons);
  
! 	if (stepCounter == 7)
  	    {
! 		stepCounter++;
  		return result;
  	    }
--- 171,182 ----
  	node6.setParent(node5);
  	node6.setSolution(true);
+ 	node6.setCompletlyExplored(true);
  
  	TreeElementDummy[] node5Sons = {node6};
  	node5.setNextLevelElements(node5Sons);
  
! 	if (_stepCounter == 7)
  	    {
! 		_stepCounter++;
  		return result;
  	    }
***************
*** 185,195 ****
  	node7.setParent(node5);
  	node7.setSolution(true);
  
  	TreeElementDummy[] node5SonsNow = {node6,node7};
  	node5.setNextLevelElements(node5SonsNow);
! 	
! 	if (stepCounter == 8)
  	    {
! 		stepCounter++;
  		return result;
  	    }
--- 190,202 ----
  	node7.setParent(node5);
  	node7.setSolution(true);
+ 	node7.setCompletlyExplored(true);
  
  	TreeElementDummy[] node5SonsNow = {node6,node7};
  	node5.setNextLevelElements(node5SonsNow);
! 	node5.setCompletlyExplored(true);
! 
! 	if (_stepCounter == 8)
  	    {
! 		_stepCounter++;
  		return result;
  	    }
***************
*** 201,205 ****
      public void reset ()
      {
! 	stepCounter = 1;
      }
      
--- 208,212 ----
      public void reset ()
      {
! 	_stepCounter = 1;
      }