Skip to content

Commit

Permalink
Merge pull request #10 from Marxan-source-code/marxan4
Browse files Browse the repository at this point in the history 
Marxan4
  • Loading branch information
@Anatoliy-Litvinenko
Anatoliy-Litvinenko authored Mar 24, 2021
2 parents 9a39896 + e0eb5f4 commit 2798eca
Show file tree
Hide file tree
Showing 10 changed files with 979 additions and 956 deletions.
2 changes: 1 addition & 1 deletion anneal.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace marxan {
typedef struct sanneal
{
long int Titns;
long int iterations;
long long iterations;
long int Tlen;
double Tinit; /* Initial Temperature */
double Tcool; /* Cooling Factor */
Expand Down
12 changes: 12 additions & 0 deletions connections.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,18 @@ namespace marxan {
double shortfall;
double probability1D;
double probability2D;
scost():
total(0.0),
pus(0),
connection(0.0),
missing(0),
penalty(0.0),
cost(0.0),
threshpen(0.0),
shortfall(0.0),
probability1D(0.0),
probability2D(0.0)
{}
} scost;

/* Connectivity Structure. Fixed connectivity number.*/
Expand Down
45 changes: 30 additions & 15 deletions hill_climbing.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,17 +67,17 @@ namespace marxan {

}

void append(int i, int puno, const scost& reserve, const scost& change, const vector<int>& R)
void append(long long i, int puno, const scost& reserve, const scost& change, const vector<int>& R)
{
iRowCounter++;
if (iRowCounter > iRowLimit)
iRowCounter = 1;

if (iRowCounter == 1)
{
fprintf(Rfp, "%i", i);
fprintf(Rfp, "%lli", i);

fprintf(ttfp, "%i,%f,%i,%f,%f,%f,%f\n"
fprintf(ttfp, "%lli,%f,%i,%f,%f,%f,%f\n"
, i, reserve.total
, reserve.pus, reserve.cost, reserve.connection, reserve.penalty,
change.total); // i,costthresh,pus,cost,connection,penalty
Expand All @@ -104,7 +104,7 @@ namespace marxan {
const vector<spu>& SM, vector<spu_out>& SM_out, double cm, int aggexist,
vector<int>& R, double prop, int clumptype, int irun, stringstream& logBuffer, rng_engine& rngEngine)
{
scost reserve = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
scost reserve;

initialiseReserve(prop, pu, R, rngEngine);

Expand All @@ -121,9 +121,9 @@ namespace marxan {
void hill_climbing(int puno, int spno, const vector<spustuff>& pu, const vector<sconnections>& connections,
vector<sspecies>& spec, const vector<spu>& SM, vector<spu_out>& SM_out, vector<int>& R, double cm,
scost& reserve, double costthresh, double tpf1, double tpf2,
int clumptype, int irun, int iterations, string savename, stringstream& logBuffer, rng_engine& rngEngine)
int clumptype, int irun, long long iterations, string savename, stringstream& logBuffer, rng_engine& rngEngine)
{
scost change = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
scost change;
int puvalid = 0, ipu = 0, imode, ichoice;
vector<int> iimparray;

Expand Down Expand Up @@ -156,7 +156,7 @@ namespace marxan {
logBuffer << "Hill climbing after array init\n";
displayProgress2(" Main Hillclimbing Section.\n");

for(int itime = 1; itime <= iterations; )
for(long long itime = 1; itime <= iterations; )
{
// shuffle iimp array
std::shuffle(iimparray.begin(), iimparray.end(), rngEngine);
Expand Down Expand Up @@ -196,7 +196,7 @@ namespace marxan {
void hill_climbing_two_steps(int puno, int spno, const vector<spustuff>& pu, const vector<sconnections>& connections,
vector<sspecies>& spec, const vector<spu>& SM, vector<spu_out>& SM_out, vector<int>& R, double cm,
scost& reserve, double costthresh, double tpf1, double tpf2,
int clumptype, int irun, int iterations, string savename, stringstream& logBuffer, rng_engine& rngEngine)
int clumptype, int irun, long long iterations, string savename, stringstream& logBuffer, rng_engine& rngEngine)
{
int puvalid = 0, ipu = 0;
vector<int> iimparray;
Expand Down Expand Up @@ -229,9 +229,8 @@ namespace marxan {

logBuffer << "Two step hillclimbing after array init\n";
displayProgress2(" Main two step hillclimbing section.\n");


for(int itime = 1; itime <= iterations; )
bool skip_add_two_units = true;
for(long long itime = 1; itime <= iterations; )
{
// shuffle iimp array
std::shuffle(iimparray.begin(), iimparray.end(), rngEngine);
Expand All @@ -240,10 +239,10 @@ namespace marxan {

for (int i0 = 0; i0 < puvalid && itime <= iterations; i0++)
{
scost change0 = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
scost change0;
bool was_change = false;
int ichoice0 = iimparray[i0];
//remenber old score
//remember old score
int imode0 = R[ichoice0] == 1 ? -1 : 1;
computeChangeScore(-1, ichoice0, spno, puno, pu, connections, spec, SM, SM_out, R, cm, imode0, change0, reserve,
costthresh, tpf1, tpf2, 1, clumptype);
Expand All @@ -258,10 +257,21 @@ namespace marxan {

for (int i1 = i0+1; i1 < puvalid && itime <= iterations; i1++, itime++)
{
scost change1 = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
scost change1;
int ichoice1 = iimparray[i1];

int imode1 = R[ichoice1] == 1 ? -1 : 1;

if(skip_add_two_units && (imode1 == imode0 && imode0 == 1))
{
//If there is not enough iterations for complete coverage,
//for cases where result amount of units is small part of total units,
//concentration of search on swap or remove pair
//may improve chance of success
itime--;
continue;
}

computeChangeScore(-1, ichoice1, spno, puno, pu, connections, spec, SM, SM_out, R, cm, imode1, change1, reserve,
costthresh, tpf1, tpf2, 1, clumptype);

Expand Down Expand Up @@ -295,7 +305,12 @@ namespace marxan {
}

if (!was_change_per_total_loop)
break;
{
if(skip_add_two_units)
skip_add_two_units = false;
else
break;
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions hill_climbing.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ namespace marxan {
void hill_climbing(int puno, int spno, const vector<spustuff>& pu, const vector<sconnections>& connections,
vector<sspecies>& spec, const vector<spu>& SM, vector<spu_out>& SM_out, vector<int>& R, double cm,
scost& reserve, double costthresh, double tpf1, double tpf2,
int clumptype, int irun, int iterations, string savename, stringstream& logBuffer, rng_engine& rngEngine);
int clumptype, int irun, long long iterations, string savename, stringstream& logBuffer, rng_engine& rngEngine);

//consider two steps in a time, move if we found two steps which generates better solution
void hill_climbing_two_steps(int puno, int spno, const vector<spustuff>& pu, const vector<sconnections>& connections,
vector<sspecies>& spec, const vector<spu>& SM, vector<spu_out>& SM_out, vector<int>& R, double cm,
scost& reserve, double costthresh, double tpf1, double tpf2,
int clumptype, int irun, int iterations, string savename, stringstream& logBuffer, rng_engine& rngEngine);
int clumptype, int irun, long long iterations, string savename, stringstream& logBuffer, rng_engine& rngEngine);
} // namespace marxan
Loading

0 comments on commit 2798eca

Please sign in to comment.