Skip to content

Commit

Permalink
fix all ciompiler warnings (gcc54-ub1604)
Browse files Browse the repository at this point in the history
 - only "member initialization" from effc++
  • Loading branch information
gaede committed Jan 31, 2018
1 parent ae540db commit 4530539
Show file tree
Hide file tree
Showing 37 changed files with 109 additions and 109 deletions.
4 changes: 2 additions & 2 deletions include/Criteria/Crit2_DeltaPhi.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ namespace KiTrack{

private:

float _deltaPhiMax;
float _deltaPhiMin;
float _deltaPhiMax{};
float _deltaPhiMin{};



Expand Down
4 changes: 2 additions & 2 deletions include/Criteria/Crit2_DeltaPhi_MV.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ namespace KiTrack{

private:

float _deltaPhiMax;
float _deltaPhiMin;
float _deltaPhiMax{};
float _deltaPhiMin{};



Expand Down
4 changes: 2 additions & 2 deletions include/Criteria/Crit2_DeltaRho.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ namespace KiTrack{

private:

float _deltaRhoMax;
float _deltaRhoMin;
float _deltaRhoMax{};
float _deltaRhoMin{};



Expand Down
4 changes: 2 additions & 2 deletions include/Criteria/Crit2_DeltaTheta_MV.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ namespace KiTrack{

private:

float _deltaThetaMax;
float _deltaThetaMin;
float _deltaThetaMax{};
float _deltaThetaMin{};



Expand Down
4 changes: 2 additions & 2 deletions include/Criteria/Crit2_Distance_MV.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ namespace KiTrack{

private:

float _deltaPos2Max;
float _deltaPos2Min;
float _deltaPos2Max{};
float _deltaPos2Min{};



Expand Down
4 changes: 2 additions & 2 deletions include/Criteria/Crit2_HelixWithIP.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ namespace KiTrack{

private:

float _ratioMax;
float _ratioMin;
float _ratioMax{};
float _ratioMin{};



Expand Down
4 changes: 2 additions & 2 deletions include/Criteria/Crit2_RZRatio.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ namespace KiTrack{

private:

float _ratioMax;
float _ratioMin;
float _ratioMax{};
float _ratioMin{};


};
Expand Down
4 changes: 2 additions & 2 deletions include/Criteria/Crit2_StraightTrackRatio.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ namespace KiTrack{

private:

float _ratioMax;
float _ratioMin;
float _ratioMax{};
float _ratioMin{};



Expand Down
4 changes: 2 additions & 2 deletions include/Criteria/Crit3_2DAngle.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ namespace KiTrack{

private:

float _cosAngleMin;
float _cosAngleMax;
float _cosAngleMin{};
float _cosAngleMax{};

};

Expand Down
4 changes: 2 additions & 2 deletions include/Criteria/Crit3_2DAngleTimesR.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ namespace KiTrack{

private:

float _angleMin;
float _angleMax;
float _angleMin{};
float _angleMax{};

};

Expand Down
4 changes: 2 additions & 2 deletions include/Criteria/Crit3_3DAngle.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ namespace KiTrack{

private:

float _cosAngleMin;
float _cosAngleMax;
float _cosAngleMin{};
float _cosAngleMax{};

};

Expand Down
4 changes: 2 additions & 2 deletions include/Criteria/Crit3_3DAngleTimesR.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ namespace KiTrack{

private:

float _angleMin;
float _angleMax;
float _angleMin{};
float _angleMax{};

};

Expand Down
4 changes: 2 additions & 2 deletions include/Criteria/Crit3_ChangeRZRatio.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ namespace KiTrack{

private:

float _ratioChangeMaxSquared;
float _ratioChangeMinSquared;
float _ratioChangeMaxSquared{};
float _ratioChangeMinSquared{};



Expand Down
4 changes: 2 additions & 2 deletions include/Criteria/Crit3_IPCircleDist.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ namespace KiTrack{

private:

float _distToCircleMax;
float _distToCircleMin;
float _distToCircleMax{};
float _distToCircleMin{};


};
Expand Down
4 changes: 2 additions & 2 deletions include/Criteria/Crit3_IPCircleDistTimesR.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ namespace KiTrack{

private:

float _distToCircleMax;
float _distToCircleMin;
float _distToCircleMax{};
float _distToCircleMin{};


};
Expand Down
4 changes: 2 additions & 2 deletions include/Criteria/Crit3_NoZigZag_MV.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ namespace KiTrack{

private:

float _prodMin;
float _prodMax;
float _prodMin{};
float _prodMax{};

};

Expand Down
6 changes: 3 additions & 3 deletions include/Criteria/Crit3_PT.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ namespace KiTrack{

private:

float _ptMin;
float _ptMax;
float _Bz;
float _ptMin{};
float _ptMax{};
float _Bz{};


};
Expand Down
6 changes: 3 additions & 3 deletions include/Criteria/Crit3_PT_MV.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ namespace KiTrack{

private:

float _ptMin;
float _ptMax;
float _Bz;
float _ptMin{};
float _ptMax{};
float _Bz{};


};
Expand Down
4 changes: 2 additions & 2 deletions include/Criteria/Crit4_2DAngleChange.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ namespace KiTrack{

private:

float _changeMin;
float _changeMax;
float _changeMin{};
float _changeMax{};

};

Expand Down
4 changes: 2 additions & 2 deletions include/Criteria/Crit4_3DAngleChange.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ namespace KiTrack{

private:

float _changeMin;
float _changeMax;
float _changeMin{};
float _changeMax{};

};

Expand Down
4 changes: 2 additions & 2 deletions include/Criteria/Crit4_3DAngleChangeNormed.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ namespace KiTrack{

private:

float _changeMin;
float _changeMax;
float _changeMin{};
float _changeMax{};

};

Expand Down
4 changes: 2 additions & 2 deletions include/Criteria/Crit4_DistOfCircleCenters.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ namespace KiTrack{

private:

float _distMax;
float _distMin;
float _distMax{};
float _distMin{};

};

Expand Down
4 changes: 2 additions & 2 deletions include/Criteria/Crit4_DistToExtrapolation.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ namespace KiTrack{

private:

float _distMin;
float _distMax;
float _distMin{};
float _distMax{};

};

Expand Down
4 changes: 2 additions & 2 deletions include/Criteria/Crit4_NoZigZag.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ namespace KiTrack{

private:

float _prodMin;
float _prodMax;
float _prodMin{};
float _prodMax{};

};

Expand Down
4 changes: 2 additions & 2 deletions include/Criteria/Crit4_PhiZRatioChange.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ namespace KiTrack{

private:

float _changeMin;
float _changeMax;
float _changeMin{};
float _changeMax{};

};

Expand Down
4 changes: 2 additions & 2 deletions include/Criteria/Crit4_RChange.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ namespace KiTrack{

private:

float _changeMin;
float _changeMax;
float _changeMin{};
float _changeMax{};

};

Expand Down
8 changes: 4 additions & 4 deletions include/Criteria/ICriterion.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ namespace KiTrack{
protected:


std::map < std::string , float > _map_name_value;
std::map < std::string , float > _map_name_value{};

bool _saveValues;
bool _saveValues{};

std::string _name;
std::string _type;
std::string _name{};
std::string _type{};

};

Expand Down
18 changes: 9 additions & 9 deletions include/Criteria/SimpleCircle.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@ class SimpleCircle {
private:


double _R;
double _centerX;
double _centerY;
double _R{};
double _centerX{};
double _centerY{};

double _x1;
double _x2;
double _x3;
double _x1{};
double _x2{};
double _x3{};

double _y1;
double _y2;
double _y3;
double _y1{};
double _y2{};
double _y3{};



Expand Down
6 changes: 3 additions & 3 deletions include/KiTrack/Automaton.h
Original file line number Diff line number Diff line change
Expand Up @@ -187,13 +187,13 @@ namespace KiTrack{
* The segments will be deleted by the Automaton in the destructor
*
*/
std::vector < std::list < Segment* > > _segments;
std::vector < std::list < Segment* > > _segments{};

/** A vector containing all the criteria, that are used in the Automaton
*/
std::vector < ICriterion* > _criteria;
std::vector < ICriterion* > _criteria{};

unsigned _nConnections;
unsigned _nConnections{};



Expand Down
18 changes: 9 additions & 9 deletions include/KiTrack/HopfieldNeuralNet.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,37 +77,37 @@ namespace KiTrack{


/** the matrix of the weights*/
std::vector < std::vector <double> > _W;
std::vector < std::vector <double> > _W{};

/** states describing how active a neuron is*/
std::vector < double > _States;
std::vector < double > _States{};


std::vector < double > _w0;
std::vector < double > _w0{};

/** temperature */
double _T;
double _T{};

/** temperature after infinite iterations */
double _TInf;
double _TInf{};

/** indicates if the neuronal network is stable.
* this is true when the change after one iteration
* of any neuron is not bigger than the value _limitForStable.
*/
bool _isStable;
bool _isStable{};

/** The upper limit for change of a neuron, if it should be considered stabel.*/
double _limitForStable;
double _limitForStable{};

/** Omega controls the influence of the quality indicator on the activation of the neuron.
*/
double _omega;
double _omega{};

/** the order of the neurons to be updated. So it should of course reach from 0 to the number of neurons -1.
* (4 , 2, 0 1, 3) will for example mean: update first the neuron 4, then the neuron 2, then 0 and so on
*/
std::vector <unsigned> _order;
std::vector <unsigned> _order{};


/** Calculates the activation function
Expand Down
Loading

0 comments on commit 4530539

Please sign in to comment.