Skip to content

Reformatted Code and Cppcheck results #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ericspod wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Reformatted Code and Cppcheck results #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33445e6
Reformatting with clang-format
ericspod Oct 5, 2021
468afdd
Formatting further
ericspod Oct 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,880 changes: 945 additions & 935 deletions src/DiscreteOpt/DiscreteCostFunction.cpp
View file
Open in desktop

Large diffs are not rendered by default.

554 changes: 298 additions & 256 deletions src/DiscreteOpt/DiscreteCostFunction.h
View file
Open in desktop

Large diffs are not rendered by default.

683 changes: 354 additions & 329 deletions src/DiscreteOpt/DiscreteGroupCostFunction.cpp
View file
Open in desktop

Large diffs are not rendered by default.

78 changes: 37 additions & 41 deletions src/DiscreteOpt/DiscreteGroupCostFunction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,52 +5,52 @@
Copyright (C) 2014 University of Oxford */

/* CCOPYRIGHT */
#include <vector>
#include "DiscreteCostFunction.h"
#include <vector>
//#include <boost/thread.hpp>
#include <boost/variant/variant.hpp>
#include <boost/variant/get.hpp>
#include <boost/variant/variant.hpp>
//#include "tbb/tick_count.h"
//using namespace tbb;

typedef map<string, boost::variant<int, string, double, float, bool> > myparam;
typedef pair<string, boost::variant<int, string, double, float, bool> > parameterPair;
typedef map<string, boost::variant<int, string, double, float, bool>> myparam;
typedef pair<string, boost::variant<int, string, double, float, bool>> parameterPair;

namespace DISCRETEOPTHOCR {

namespace DISCRETEOPTHOCR{
class GroupDiscreteCostFunction : public SRegDiscreteCostFunction {

class GroupDiscreteCostFunction: public SRegDiscreteCostFunction
{

public:
public:
//
// Constructor.
//
GroupDiscreteCostFunction();
// ~GroupDiscreteCostFunction();
//// SET UP //////////////////

void set_parameters(myparam & );
void set_parameters(myparam&);
/// neighbouhood info
void set_relations(const boost::shared_ptr<RELATIONS> &CONTROL,const boost::shared_ptr<RELATIONS> &TARG);
void set_relations(const boost::shared_ptr<RELATIONS>& CONTROL, const boost::shared_ptr<RELATIONS>& TARG);
void get_spacings();
void set_meshes(const NEWMESH::newmesh & target,const NEWMESH::newmesh & source, const NEWMESH::newmesh & GRID, int num=1){_TEMPLATE=target;

_ORIG=source;
num_subjects=num;
VERTICES_PER_SUBJ=GRID.nvertices();
TRIPLETS_PER_SUBJ=GRID.ntriangles();
MVD_LR=Calculate_MVD(GRID);
cout << " costfunction set meshes " << num << endl;
for (int i=0;i<num;i++){
_DATAMESHES.push_back(source);
_CONTROLMESHES.push_back(GRID);
}
}
void set_meshes(const NEWMESH::newmesh& target, const NEWMESH::newmesh& source, const NEWMESH::newmesh& GRID, int num = 1)
{
_TEMPLATE = target;

_ORIG = source;
num_subjects = num;
VERTICES_PER_SUBJ = GRID.nvertices();
TRIPLETS_PER_SUBJ = GRID.ntriangles();
MVD_LR = Calculate_MVD(GRID);
cout << " costfunction set meshes " << num << endl;
for (int i = 0; i < num; i++) {
_DATAMESHES.push_back(source);
_CONTROLMESHES.push_back(GRID);
}
}

//// INITIALISATION //////////////////

virtual void initialize(int numNodes, int numLabels, int numPairs, int numTriplets = 0,int numQuartets = 0); // quartets not used yet so no code for them below
virtual void initialize(int numNodes, int numLabels, int numPairs, int numTriplets = 0, int numQuartets = 0); // quartets not used yet so no code for them below
void define_template_patches();
void resample_to_template(); /// resamples all data ontotemplate

Expand All @@ -63,34 +63,32 @@ namespace DISCRETEOPTHOCR{
}
*/
//////////////// Updates ///////////////////////
void reset_source(const NEWMESH::newmesh & source, int num=0){_DATAMESHES[num]=source;}
virtual void reset_CPgrid(const NEWMESH::newmesh & grid,int num=0){_CONTROLMESHES[num]=grid;}
void reset_source(const NEWMESH::newmesh& source, int num = 0) { _DATAMESHES[num] = source; }
virtual void reset_CPgrid(const NEWMESH::newmesh& grid, int num = 0) { _CONTROLMESHES[num] = grid; }


double computeQuartetCost(int quartet, int labelA, int labelB, int labelC,int labelD);
double computeQuartetCost(int quartet, int labelA, int labelB, int labelC, int labelD);

double computeTripletCost(int triplet, int labelA, int labelB, int labelC);
double computePairwiseCost(int pair, int labelA, int labelB);

void resample_patches();
void resampler_worker_function(const int &, const int &,const vector<bool> &);
map<int,float> resample_onto_template(const int &,const int &,const Pt &, const vector<int> &);

protected:
void resampler_worker_function(const int&, const int&, const vector<bool>&);
map<int, float> resample_onto_template(const int&, const int&, const Pt&, const vector<int>&);

protected:
//////////////////////// MESHES //////////////////////
vector<NEWMESH::newmesh> _DATAMESHES; // TARGET MESH
vector<NEWMESH::newmesh> _CONTROLMESHES; // TARGET MESH
newmesh _TEMPLATE;
/////////////////////// NEIGHBOURHOOD INFO ////////////////////
vector<boost::shared_ptr<RELATIONS> > _CONTROLRELATIONS; // hold control grid neighbours of each source vertex
vector<boost::shared_ptr<RELATIONS> > _TEMPLATERELATIONS; // hold target grid neighbours of each source vertex
vector<vector<int> > TEMPLATEPTS;
vector<boost::shared_ptr<RELATIONS>> _CONTROLRELATIONS; // hold control grid neighbours of each source vertex
vector<boost::shared_ptr<RELATIONS>> _TEMPLATERELATIONS; // hold target grid neighbours of each source vertex
vector<vector<int>> TEMPLATEPTS;
vector<ColumnVector> SPACINGS;

//////////////////////DATA//////////////////
vector<Matrix> RESAMPLEDDATA;
vector<map<int,float> > PATCHDATA;
vector<Matrix> RESAMPLEDDATA;
vector<map<int, float>> PATCHDATA;
//double **L1data;

//Engine *eng; /// matlab engine
Expand All @@ -104,8 +102,6 @@ namespace DISCRETEOPTHOCR{

bool _quadcost;
bool _setpairs;

};

};

}
Loading