[Robotflow-cvs] RobotFlow/Behaviors/src RangeFashion.cc,1.1,1.2

[MagellanPro <mag...@us...>]

Update of /cvsroot/robotflow/RobotFlow/Behaviors/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14759

Modified Files:
	RangeFashion.cc 
Log Message:
Tested version (first iteration)


Index: RangeFashion.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Behaviors/src/RangeFashion.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RangeFashion.cc	30 Jun 2005 21:13:21 -0000	1.1
--- RangeFashion.cc	1 Jul 2005 01:52:34 -0000	1.2
***************
*** 95,103 ****
            int i=0;
            for(iterIR = irReading.begin(); iterIR != irReading.end(); ++iterIR){
!               if(*iterIR <= 100)  // Max value IR
                    (*vectPercept)[i]=*iterIR;
!               ++i;
            }		
        }
        
        // Priority #2
--- 95,110 ----
            int i=0;
            for(iterIR = irReading.begin(); iterIR != irReading.end(); ++iterIR){
!               if(*iterIR <= 1000)  // Max value IR
                    (*vectPercept)[i]=*iterIR;
! 	      ++i;
            }		
        }
+ 
+ 	std::cout << "IR -> ";
+ 	Vector<int>::iterator iterA;
+ 	for(iterA = vectPercept->begin(); iterA != vectPercept->end(); ++iterA){
+ 		std::cout << *iterA << " ";
+ 	}
+ 	std::cout << std::endl;
        
        // Priority #2
***************
*** 157,172 ****
            int i=0;
            for(iterSonar = sonarReading.begin(); iterSonar != sonarReading.end(); ++iterSonar) {
!               if((*iterSonar = -1) && (*iterSonar<10000))  // Max value Sonar
                    (*vectPercept)[i]=*iterSonar;
                ++i;
            }		
        }
!       
        // Substitue max range for the value of -1
!       Vector<int>::iterator iterPercept;
        for(iterPercept = vectPercept->begin(); iterPercept != vectPercept->end(); ++iterPercept) {
          if(*iterPercept < 0)  // Max value IR
              *iterPercept = 10000;
!       }
    }
  
--- 164,185 ----
            int i=0;
            for(iterSonar = sonarReading.begin(); iterSonar != sonarReading.end(); ++iterSonar) {
!               if(((*vectPercept)[i] == -1) && (*iterSonar<10000))  // Max value Sonar
                    (*vectPercept)[i]=*iterSonar;
                ++i;
            }		
        }
!         
!         std::cout << "Sonar -> ";
! 	for(iterA = vectPercept->begin(); iterA != vectPercept->end(); ++iterA){
! 	    std::cout << *iterA << " ";
! 	}
! 	std::cout << std::endl;
! 				      
        // Substitue max range for the value of -1
! /*      Vector<int>::iterator iterPercept;
        for(iterPercept = vectPercept->begin(); iterPercept != vectPercept->end(); ++iterPercept) {
          if(*iterPercept < 0)  // Max value IR
              *iterPercept = 10000;
!       }*/
    }