use 'unsigned int' instead of 'int' and save a lot of runtime 'if'

diff --git a/lib/src1/brukerobjectvaryingproperties.cpp b/lib/src1/brukerobjectvaryingproperties.cpp
index 69ddf7f64ddf8778dbbe05af2dd50246c1bbf694..5e9b92cd9fdeb75e07aaa3b10dc03fed43f93eb2 100644 (file)
--- a/lib/src1/brukerobjectvaryingproperties.cpp
+++ b/lib/src1/brukerobjectvaryingproperties.cpp
@@ -41,8 +41,8 @@ void BrukerObjectVaryingProperties::setTE(std::map<std::string, BrukerFieldData>
    TE = BrukerHM[(std::string) "ACQ_echo_time"].GetDoubleValue();
 };
 
-double BrukerObjectVaryingProperties::getTE(int theValue) const{
-   if (theValue < TE.size() && theValue >=0) {return TE[theValue];}
+double BrukerObjectVaryingProperties::getTE(unsigned int theValue) const{
+   if (theValue < TE.size() ) {return TE[theValue];}
    else throw 0;
 }
 
@@ -51,8 +51,8 @@ double BrukerObjectVaryingProperties::getTE(int theValue) const{
   TE = theValue;
 }*/
 
-double  BrukerObjectVaryingProperties::getPositionP(int theValue) const{
-   if (theValue < PositionP.size() && theValue >=0) return PositionP[theValue];
+double  BrukerObjectVaryingProperties::getPositionP(unsigned int theValue) const{
+   if (theValue < PositionP.size() ) return PositionP[theValue];
    else throw 0;
 }
   
@@ -61,8 +61,8 @@ double  BrukerObjectVaryingProperties::getPositionP(int theValue) const{
   PositionP = theValue;
 }*/
 
-double  BrukerObjectVaryingProperties::getPositionR(int theValue) const{
-   if (theValue < PositionR.size() && theValue >=0) return PositionR[theValue];
+double  BrukerObjectVaryingProperties::getPositionR(unsigned int theValue) const{
+   if (theValue < PositionR.size() ) return PositionR[theValue];
    else throw 0;
 }
 
@@ -71,8 +71,8 @@ double  BrukerObjectVaryingProperties::getPositionR(int theValue) const{
   PositionP = theValue;
 }*/
 
-double  BrukerObjectVaryingProperties::getPositionS(int theValue) const{
-   if (theValue < PositionS.size() && theValue >=0)  return PositionS[theValue];
+double  BrukerObjectVaryingProperties::getPositionS(unsigned int theValue) const{
+   if (theValue < PositionS.size() )  return PositionS[theValue];
    else throw 0;
 }
 
@@ -81,8 +81,8 @@ double  BrukerObjectVaryingProperties::getPositionS(int theValue) const{
   PositionP = theValue;
 }*/
 
-int  BrukerObjectVaryingProperties::getAcquisitionOrder(int theValue) const{
-   if (theValue <AcquisitionOrder.size() && theValue >=0)  return AcquisitionOrder[theValue];
+int  BrukerObjectVaryingProperties::getAcquisitionOrder(unsigned int theValue) const{
+   if (theValue <AcquisitionOrder.size())  return AcquisitionOrder[theValue];
    else throw 0;
 }
 
@@ -103,8 +103,8 @@ void BrukerObjectVaryingProperties::setAcquisitionOrder(std::map<std::string, Br
   AcquisitionOrder=AcqOrder;
 };
 
-std :: vector < std :: vector < double > >  BrukerObjectVaryingProperties::getOrientation(int theValue) const{
-   if (theValue <Orientation.size() && theValue >=0)return Orientation[theValue];
+std :: vector < std :: vector < double > >  BrukerObjectVaryingProperties::getOrientation(unsigned int theValue) const{
+   if (theValue <Orientation.size())return Orientation[theValue];
    else throw 0;
 }
 
@@ -149,8 +149,8 @@ void BrukerObjectVaryingProperties::setOrientation(std::map<std::string, BrukerF
    Orientation=Temp3D;
 };
 
-double  BrukerObjectVaryingProperties::getPositionTimePerNR(int theValue) const{
-   if (theValue <PositionTimePerNR.size() && theValue >=0) return PositionTimePerNR[theValue];
+double  BrukerObjectVaryingProperties::getPositionTimePerNR(unsigned int theValue) const{
+   if (theValue <PositionTimePerNR.size() ) return PositionTimePerNR[theValue];
    else throw 0;
 }
 
@@ -162,8 +162,8 @@ void BrukerObjectVaryingProperties::setPositionTimePerNR(std::map<std::string, B
    double temp;
 
 /*
- les loop de 0 a  3 ne sont pas conceres par le temps car ils creent presque systematiquement
-un melange temporel des donnees, c'est pour cela que je ne calcule q'un temps moyen a  partir de celles -ci
+ les loop de 0 a  3 ne sont pas concernes par le temps car ils creent presque systematiquement
+ un melange temporel des donnees, c'est pour cela que je ne calcule qu'un temps moyen a  partir de celles -ci
 */
    for (i=4; i<(LoopStruct.size()-1);i++)
    { 

diff --git a/lib/src1/brukerobjectvaryingproperties.h b/lib/src1/brukerobjectvaryingproperties.h
index 9158a68068589e541c688a6dffe8911e40ec7feb..8e7d76ad02ff7c74354314c60d9b8ed0033f5716 100644 (file)
--- a/lib/src1/brukerobjectvaryingproperties.h
+++ b/lib/src1/brukerobjectvaryingproperties.h
@@ -32,14 +32,14 @@ public:
    BrukerObjectVaryingProperties();
    ~BrukerObjectVaryingProperties();
    
-   double getTE               (int theValue) const;
-   double getPositionP        (int theValue) const;
-   double getPositionR        (int theValue) const;
-   double getPositionS        (int theValue) const;
-   double getPositionTimePerNR(int theValue) const;
-   int    getAcquisitionOrder (int theValue) const;
+   double getTE               (unsigned int theValue) const;
+   double getPositionP        (unsigned int theValue) const;
+   double getPositionR        (unsigned int theValue) const;
+   double getPositionS        (unsigned int theValue) const;
+   double getPositionTimePerNR(unsigned int theValue) const;
+   int    getAcquisitionOrder (unsigned int theValue) const;
 
-   std::vector<std::vector<double> > getOrientation(int theValue) const;
+   std::vector<std::vector<double> > getOrientation(unsigned int theValue) const;
 
    bool init(std::map<std::string, BrukerFieldData> &BrukerHM, std::vector<int> &LoopStruct);