Skip to content

Commit 8e2e94f

Browse files
committed
fixed linting issues
1 parent f5ecb03 commit 8e2e94f

File tree

3 files changed

+94
-62
lines changed

3 files changed

+94
-62
lines changed

fitbenchmarking/cli/main.py

Lines changed: 92 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -76,68 +76,98 @@ def get_parser():
7676

7777
root = Path(inspect.getfile(fitbenchmarking)).parent
7878

79-
parser.add_argument('-o', '--options-file',
80-
metavar='OPTIONS_FILE',
81-
default='',
82-
help='The path to a %(prog)s options file.')
83-
parser.add_argument('-p', '--problem_sets',
84-
nargs='+',
85-
default=[root.joinpath("benchmark_problems",
86-
"NIST",
87-
"average_difficulty")],
88-
help='Paths to directories containing problem sets.')
89-
parser.add_argument('-r', '--results_dir',
90-
metavar='RESULTS_DIR',
91-
default='',
92-
help='The directory to store resulting files in.')
93-
parser.add_argument('-d', '--debug-mode',
94-
default=False,
95-
action='store_true',
96-
help='Enable debug mode (prints traceback).',)
97-
parser.add_argument('-n', '--num_runs',
98-
metavar='NUM_RUNS',
99-
type=int,
100-
default=0,
101-
help="Set the number of runs to average "
102-
"each fit over.")
103-
parser.add_argument('-a', '--algorithm_type',
104-
metavar='ALGORITHM_TYPE',
105-
nargs='+',
106-
type=str,
107-
default=[],
108-
help="Select what type of algorithm is used within a "
109-
"specific software.")
110-
parser.add_argument('-s', '--software',
111-
metavar='SOFTWARE',
112-
nargs='+',
113-
type=str,
114-
default=[],
115-
help="Select the fitting software to benchmark.")
116-
parser.add_argument('-j', '--jac_method',
117-
metavar='JAC_METHOD',
118-
nargs='+',
119-
type=str,
120-
default=[],
121-
help="Set the Jacobian to be used.")
122-
parser.add_argument('-c', '--cost_func_type',
123-
metavar='COST_FUNC_TYPE',
124-
nargs='+',
125-
type=str,
126-
default=[],
127-
help="Set the cost functions to be used "
128-
"for the given data.")
129-
parser.add_argument('-rt', '--runtime_metric',
130-
metavar='RUNTIME_METRIC',
131-
choices=['mean',
132-
'minimum',
133-
'maximum',
134-
'first',
135-
'median',
136-
'harmonic',
137-
'trim'],
138-
type=str,
139-
default='',
140-
help="Set the metric for the runtime.")
79+
parser.add_argument(
80+
"-o",
81+
"--options-file",
82+
metavar="OPTIONS_FILE",
83+
default="",
84+
help="The path to a %(prog)s options file.",
85+
)
86+
parser.add_argument(
87+
"-p",
88+
"--problem_sets",
89+
nargs="+",
90+
default=[
91+
root.joinpath("benchmark_problems", "NIST", "average_difficulty")
92+
],
93+
help="Paths to directories containing problem sets.",
94+
)
95+
parser.add_argument(
96+
"-r",
97+
"--results_dir",
98+
metavar="RESULTS_DIR",
99+
default="",
100+
help="The directory to store resulting files in.",
101+
)
102+
parser.add_argument(
103+
"-d",
104+
"--debug-mode",
105+
default=False,
106+
action="store_true",
107+
help="Enable debug mode (prints traceback).",
108+
)
109+
parser.add_argument(
110+
"-n",
111+
"--num_runs",
112+
metavar="NUM_RUNS",
113+
type=int,
114+
default=0,
115+
help="Set the number of runs to average " "each fit over.",
116+
)
117+
parser.add_argument(
118+
"-a",
119+
"--algorithm_type",
120+
metavar="ALGORITHM_TYPE",
121+
nargs="+",
122+
type=str,
123+
default=[],
124+
help="Select what type of algorithm is used within a "
125+
"specific software.",
126+
)
127+
parser.add_argument(
128+
"-s",
129+
"--software",
130+
metavar="SOFTWARE",
131+
nargs="+",
132+
type=str,
133+
default=[],
134+
help="Select the fitting software to benchmark.",
135+
)
136+
parser.add_argument(
137+
"-j",
138+
"--jac_method",
139+
metavar="JAC_METHOD",
140+
nargs="+",
141+
type=str,
142+
default=[],
143+
help="Set the Jacobian to be used.",
144+
)
145+
parser.add_argument(
146+
"-c",
147+
"--cost_func_type",
148+
metavar="COST_FUNC_TYPE",
149+
nargs="+",
150+
type=str,
151+
default=[],
152+
help="Set the cost functions to be used " "for the given data.",
153+
)
154+
parser.add_argument(
155+
"-rt",
156+
"--runtime_metric",
157+
metavar="RUNTIME_METRIC",
158+
choices=[
159+
"mean",
160+
"minimum",
161+
"maximum",
162+
"first",
163+
"median",
164+
"harmonic",
165+
"trim",
166+
],
167+
type=str,
168+
default="",
169+
help="Set the metric for the runtime.",
170+
)
141171

142172
parser.add_argument(
143173
"--port",

fitbenchmarking/cli/tests/test_main.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
"""
22
This file contains unit tests for the main CLI script
33
"""
4+
45
import inspect
56
import os
67
from pathlib import Path

fitbenchmarking/utils/exceptions.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@ class FilePathError(FitBenchmarkException):
271271
"""
272272
Indicates the filepath is invalid.
273273
"""
274+
274275
class_message = "The filepath is invalid."
275276
error_code = 25
276277

0 commit comments

Comments
 (0)