From ced3dc9e9828a2c10e7ff3b3a1813105417e0e6d Mon Sep 17 00:00:00 2001
From: Marco <marcovoort@gmail.com>
Date: Wed, 13 Sep 2017 17:55:27 +0200
Subject: [PATCH] Solve error in latex options output, solve dangling else
warning
---
src/Options.c | 14 ++++++++------
src/SparseMatrix.c | 5 +++--
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/Options.c b/src/Options.c
index 087ba38..ad3548f 100644
--- a/src/Options.c
+++ b/src/Options.c
@@ -487,6 +487,8 @@ int ExportOptionsToLaTeX(FILE *Out, const struct opts *Opts) {
fprintf(Out, "ZeroVolumeSearch & ");
if (Opts->ZeroVolumeSearch == ZeroVolYes) fprintf(Out, "yes");
else if (Opts->ZeroVolumeSearch == ZeroVolNo) fprintf(Out, "no");
+ else fprintf(Out, "?");
+ fprintf(Out, " \\\\\n");
fprintf(Out, "ImproveFreeNonzeros & ");
if (Opts->ImproveFreeNonzeros == FreeNonzerosYes) fprintf(Out, "yes");
@@ -882,7 +884,7 @@ int SetOption(struct opts *pOptions, const char *option, const char *value) {
} else if (!strcmp(value, "no")) {
pOptions->DiscardFreeNets = FreeNetNo;
} else {
- fprintf(stderr, "SetOptions(): unknown %s '%s'!\n", option, value);
+ fprintf(stderr, "SetOption(): unknown %s '%s'!\n", option, value);
return FALSE;
}
} else if (!strcmp(option, "ZeroVolumeSearch")) {
@@ -891,15 +893,15 @@ int SetOption(struct opts *pOptions, const char *option, const char *value) {
} else if (!strcmp(value, "no")) {
pOptions->ZeroVolumeSearch = ZeroVolNo;
} else {
- fprintf(stderr, "SetOptions(): unknown %s '%s'!\n", option, value);
+ fprintf(stderr, "SetOption(): unknown %s '%s'!\n", option, value);
return FALSE;
}
} else if (!strcmp(option, "ImproveFreeNonzeros")) {
- if (!strcmp(value, "no") || !strcmp(value, "0"))
+ if (!strcmp(value, "no") || !strcmp(value, "0")) {
pOptions->ImproveFreeNonzeros = FreeNonzerosNo;
- else if (!strcmp(value, "yes") || ! strcmp(value, "1"))
+ } else if (!strcmp(value, "yes") || ! strcmp(value, "1")) {
pOptions->ImproveFreeNonzeros = FreeNonzerosYes;
- else {
+ } else {
fprintf(stderr, "SetOption(): unknown %s '%s'!\n", option, value);
return FALSE;
}
@@ -909,7 +911,7 @@ int SetOption(struct opts *pOptions, const char *option, const char *value) {
} else if (!strcmp(value, "no")) {
pOptions->CheckUpperBound = CheckUpperBoundNo;
} else {
- fprintf(stderr, "SetOptions(): unknown %s '%s'!\n", option, value);
+ fprintf(stderr, "SetOption(): unknown %s '%s'!\n", option, value);
return FALSE;
}
} else if (!strcmp(option, "SquareMatrix_DistributeVectorsEqual")) {
diff --git a/src/SparseMatrix.c b/src/SparseMatrix.c
index 14dc8ab..c35b6c3 100644
--- a/src/SparseMatrix.c
+++ b/src/SparseMatrix.c
@@ -1562,13 +1562,14 @@ int MMSparseMatrixPrintPstart(struct sparsematrix *pM, FILE *stream, const struc
return FALSE;
}
- if (pM->MMTypeCode[0] == 'D')
+ if (pM->MMTypeCode[0] == 'D') {
for (t = 0; t <= pM->NrProcs; t++ )
if( pOptions->OutputFormat==OutputDMM )
fprintf(stream, "%ld\n", pM->Pstart[t]);
else /* default to 1-based, except if explicitly in old Mondriaan mode */
fprintf(stream, "%ld\n", pM->Pstart[t]+1);
-
+ }
+
return TRUE;
} /* end MMSparseMatrixPrintPstart */
--
GitLab