Skip to content
Permalink
Browse files

[pal] Cleanup some doxygen comments

  • Loading branch information
nyalldawson committed Jun 29, 2015
1 parent 277605b commit f305b0b101947fb0de4ec25ec889ad6ad427763c
Showing with 12 additions and 29 deletions.
  1. +0 −4 src/core/pal/feature.cpp
  2. +0 −7 src/core/pal/pal.cpp
  3. +0 −18 src/core/pal/problem.cpp
  4. +12 −0 src/core/pal/problem.h
@@ -125,10 +125,6 @@ namespace pal
}
}


/*
* \brief read coordinates from a GEOS geom
*/
void FeaturePart::extractCoords( const GEOSGeometry* geom )
{
int i, j;
@@ -943,18 +943,11 @@ namespace pal
}
}


/**
* \brief get current map unit
*/
Units Pal::getMapUnit()
{
return map_unit;
}

/**
* \brief set map unit
*/
void Pal::setMapUnit( Units map_unit )
{
if ( map_unit == pal::PIXEL || map_unit == pal::METER
@@ -219,9 +219,6 @@ namespace pal
delete[] ok;
}

/**
* \brief Basic initial solution : every feature to -1
*/
void Problem::init_sol_empty()
{
int i;
@@ -744,9 +741,6 @@ namespace pal
return subPart;
}


/** From SubPart.cpp ***/

double Problem::compute_feature_cost( SubPart *part, int feat_id, int label_id, int *nbOverlap )
{
double cost;
@@ -1959,10 +1953,6 @@ namespace pal
return retainedChain;
}


/**
* POPMUSIC, chain
*/
double Problem::popmusic_chain( SubPart *part )
{
int i;
@@ -2114,14 +2104,6 @@ namespace pal
return initial_cost - best_cost;
}




/**
*
* POPMUSIC, Tabu search with chain'
*
*/
double Problem::popmusic_tabu_chain( SubPart *part )
{
int i;
@@ -137,11 +137,23 @@ namespace pal
double compute_feature_cost( SubPart *part, int feat_id, int label_id, int *nbOverlap );
double compute_subsolution_cost( SubPart *part, int *s, int * nbOverlap );

/**
* POPMUSIC, chain
*/
double popmusic_chain( SubPart *part );

double popmusic_tabu( SubPart *part );

/**
*
* POPMUSIC, Tabu search with chain'
*
*/
double popmusic_tabu_chain( SubPart *part );

/**
* \brief Basic initial solution : every feature to -1
*/
void init_sol_empty();
void init_sol_falp();

0 comments on commit f305b0b

Please sign in to comment.
You can’t perform that action at this time.