[Nice-commit] Nice/src/mlsub/typing/lowlevel K0.java,1.21,1.22

[Daniel B. <bo...@us...>]

Update of /cvsroot/nice/Nice/src/mlsub/typing/lowlevel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30198/src/mlsub/typing/lowlevel

Modified Files:
	K0.java 
Log Message:
Save the constraint when there are any soft variables (which happens when
in existential mode).


Index: K0.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/mlsub/typing/lowlevel/K0.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** K0.java	23 Mar 2004 20:28:43 -0000	1.21
--- K0.java	26 Mar 2004 16:15:39 -0000	1.22
***************
*** 1336,1340 ****
      Backup previous;
      int savedM;
!     int savedN;
      BitVector savedGarbage;
      DomainVector savedDomains;
--- 1336,1340 ----
      Backup previous;
      int savedM;
!     BitMatrix savedC;
      BitVector savedGarbage;
      DomainVector savedDomains;
***************
*** 1348,1353 ****
        }
        this.savedM = K0.this.m;
!       this.savedN = K0.this.n;
!       
        this.savedGarbage = (BitVector)K0.this.garbage.clone();
        this.savedDomains = (DomainVector)K0.this.domains.clone();
--- 1348,1357 ----
        }
        this.savedM = K0.this.m;
! 
!       // We only need to save C if there are soft variables, since
!       // others can't be modified anyway.
!       if (K0.this.m != K0.this.n)
!         this.savedC = (BitMatrix) K0.this.C.clone();
! 
        this.savedGarbage = (BitVector)K0.this.garbage.clone();
        this.savedDomains = (DomainVector)K0.this.domains.clone();
***************
*** 1389,1395 ****
      this.Rt.setSize(m);
  
!     this.n = backup.savedN;
!     this.C.setSize(n);
!     this.Ct.setSize(n);
  
      this.garbage = backup.savedGarbage;
--- 1393,1408 ----
      this.Rt.setSize(m);
  
!     if (backup.savedC != null)
!       {
!         this.C = backup.savedC;
!         this.Ct = backup.savedC.transpose();
!         this.n = backup.savedC.size();
!       }
!     else
!       {
!         this.n = backup.savedM;
!         this.C.setSize(n);
!         this.Ct.setSize(n);
!       }
  
      this.garbage = backup.savedGarbage;