Skip to content

Commit 7d11eb6

Browse files
Make output order same as Marxan 2.
1 parent c4607f8 commit 7d11eb6

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

marxan.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ namespace marxan {
4646
int savelog;
4747
int verbosity = 0;
4848
int asymmetricconnectivity = 0;
49-
string sVersionString = "Marxan v 4.0.5";
49+
string sVersionString = "Marxan v 4.0.6";
5050
string sMarxanWebSite = "https://marxansolutions.org/";
5151
string sTraceFileName;
5252
string sApplicationPathName;

output.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,7 @@ namespace marxan {
767767
// print clump type
768768
fprintf(fp, "%s\n", clumptypeMap[clumptype].c_str());
769769

770-
fprintf(fp, "Algorithm Used :%s\n", runoptions.algorithm_description().c_str());
770+
fprintf(fp, "Algorithm Used: %s\n", runoptions.algorithm_description().c_str());
771771

772772
if (runoptions.HeuristicOn)
773773
{
@@ -842,7 +842,7 @@ namespace marxan {
842842

843843
fprintf(fp, "\n");
844844

845-
for (isp = 0; isp < spno; isp++)
845+
for (isp = spno - 1 ; isp >= 0; isp--)
846846
{
847847
rMPM = 1;
848848

@@ -931,7 +931,7 @@ namespace marxan {
931931
fprintf(fp, "\"planning_unit\",\"number\"\n");
932932
}
933933

934-
for (int i = puno -1 ; i >= 0; i--)
934+
for (int i = puno - 1 ; i >= 0; i--)
935935
fprintf(fp, "%i%c%i\n", pu[i].id, sDelimiter, sumsoln[i]);
936936

937937
fclose(fp);

0 commit comments

Comments
 (0)