diff -u -r1.2 -r1.3
--- LayerStatChain.java	7 Mar 2005 06:09:09 -0000	1.2
+++ LayerStatChain.java	25 Jul 2007 02:51:55 -0000	1.3
@@ -42,6 +42,8 @@

     
     // package (private) methods
     

+    private boolean debug;
+    

     // constructor from a layer status
     // current status is set, cluster status is left unset
     LayerStatChain( LayerStat lstat)

@@ -50,10 +52,10 @@

         _stats.add(lstat);
         _istat_current = _stats.listIterator(); //should be first iterator
         _istat_cluster = _stats.listIterator(_stats.size()); //should be last iterator, needs work

-        System.out.println("_istat_current.hasNext()= "+_istat_current.hasNext());
-        System.out.println("_istat_current= "+_istat_current);
-        System.out.println("_istat_cluster.hasNext()= "+_istat_cluster.hasNext());
-        System.out.println("_istat_cluster= "+_istat_cluster);

+        if(debug) System.out.println("_istat_current.hasNext()= "+_istat_current.hasNext());
+        if(debug) System.out.println("_istat_current= "+_istat_current);
+        if(debug) System.out.println("_istat_cluster.hasNext()= "+_istat_cluster.hasNext());
+        if(debug) System.out.println("_istat_cluster= "+_istat_cluster);

         
     }
     

@@ -119,28 +121,28 @@

         }
         _istat_current = _stats.listIterator(_stats.size());
         _istat_cluster = _stats.listIterator(_stats.size());

-        System.out.println("_stats.size()= "+_stats.size());

+        if(debug) System.out.println("_stats.size()= "+_stats.size());

         for(int i = 0; i< _stats.size(); ++i)
         {
             ListIterator cur = lsc._stats.listIterator(i);

-            System.out.println("cur= "+cur);

+            if(debug) System.out.println("cur= "+cur);

             ListIterator clu = lsc._stats.listIterator(i);

-            System.out.println("clu= "+clu);

+            if(debug) System.out.println("clu= "+clu);

             if (cur.equals(lsc._istat_current) ) _istat_current = _stats.listIterator(i);
             {
                 _istat_current = _stats.listIterator(i);

-                System.out.println("found current match, i= "+i);

+                if(debug) System.out.println("found current match, i= "+i);

             }
             if (clu == lsc._istat_cluster) _istat_cluster = _stats.listIterator(i);
             {
                 _istat_cluster = _stats.listIterator(i);

-                System.out.println("found cluster match, i= "+i);

+                if(debug) System.out.println("found cluster match, i= "+i);

             }
             
         }
         

-        System.out.println("copy _istat_current.hasNext()= "+_istat_current.hasNext());
-        System.out.println("copy _istat_cluster.hasNext()= "+_istat_cluster.hasNext());

+        if(debug) System.out.println("copy _istat_current.hasNext()= "+_istat_current.hasNext());
+        if(debug) System.out.println("copy _istat_cluster.hasNext()= "+_istat_cluster.hasNext());

     }
     
     // Is the cluster status set?

@@ -167,8 +169,8 @@

     LayerStat currentStatus()
     {
         Assert.assertTrue( currentStatusIsValid() );

-        System.out.println("get_current_status= "+_istat_current.hasNext());
-        System.out.println("_istat_current nextIndex= "+ _istat_current.nextIndex());

+        if(debug) System.out.println("get_current_status= "+_istat_current.hasNext());
+        if(debug) System.out.println("_istat_current nextIndex= "+ _istat_current.nextIndex());

         return (LayerStat) _stats.get(_istat_current.nextIndex());
     }
     

diff -u -r1.2 -r1.3
--- LTrack.java	7 Mar 2005 06:09:09 -0000	1.2
+++ LTrack.java	25 Jul 2007 02:51:55 -0000	1.3
@@ -49,7 +49,7 @@

     
     //package (friend) protection
     

-    

+    private boolean debug;

     
     /**
      *  constructor from track and layer status

@@ -154,14 +154,14 @@

     public boolean setNextStatus()
     {
         if ( !_chain._istat_current.hasNext() ) return false;

-        System.out.println("in set_next_status");
-        System.out.println("_chain._istat_current "+_chain._istat_current);
-        System.out.println("_chain._stats.listIterator(_chain._stats.size()) "+_chain._stats.listIterator(_chain._stats.size()));

+        if(debug) System.out.println("in set_next_status");
+        if(debug) System.out.println("_chain._istat_current "+_chain._istat_current);
+        if(debug) System.out.println("_chain._stats.listIterator(_chain._stats.size()) "+_chain._stats.listIterator(_chain._stats.size()));

         if ( _chain._istat_current == _chain._stats.listIterator(_chain._stats.size()) ) return false;
         if(!_chain._istat_current.hasNext()) return false;
         _chain._istat_current = _chain._stats.listIterator(_chain._istat_current.nextIndex()+1);
         if ( !_chain._istat_current.hasNext() ) return false;

-        System.out.println("returning true");

+        if(debug) System.out.println("returning true");

         return true;
     }
     

@@ -176,10 +176,10 @@

     public boolean setPreviousStatus()
     {
         if ( atTopStatus() ) return false;

-        System.out.println("in set_previous_status");
-        System.out.println("_istat_current nextIndex= "+_chain._istat_current.nextIndex());

+        if(debug) System.out.println("in set_previous_status");
+        if(debug) System.out.println("_istat_current nextIndex= "+_chain._istat_current.nextIndex());

         _chain._istat_current = _chain._stats.listIterator(_chain._istat_current.previousIndex());

-        System.out.println("_istat_current nextIndex= "+_chain._istat_current.nextIndex());

+        if(debug) System.out.println("_istat_current nextIndex= "+_chain._istat_current.nextIndex());

         
         return true;
     }

diff -u -r1.2 -r1.3
--- TLayer.java	7 Mar 2005 06:09:10 -0000	1.2
+++ TLayer.java	25 Jul 2007 02:51:55 -0000	1.3
@@ -20,6 +20,8 @@

     private  ClusterFinder _finder;
     private int _state;
     

+    private boolean debug;
+    

     public TLayer()
     {
     }

@@ -52,9 +54,9 @@

     public void check(LayerStat lstat)
     {
         Assert.assertTrue( _exit == lstat.atExit() );

-        System.out.println("Miss = "+_miss);
-        System.out.println("Miss likelihood= "+_miss.likelihood());
-        System.out.println("LStat likelihood= "+lstat.miss().likelihood());

+        if(debug) System.out.println("Miss = "+_miss);
+        if(debug) System.out.println("Miss likelihood= "+_miss.likelihood());
+        if(debug) System.out.println("LStat likelihood= "+lstat.miss().likelihood());

         
         Assert.assertTrue( _miss == null || _miss.likelihood()
         == lstat.miss().likelihood() );