summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine Rolet <antoine.rolet@gmail.com>2017-09-09 17:30:23 +0900
committerAntoine Rolet <antoine.rolet@gmail.com>2017-09-09 17:30:23 +0900
commit1ba2c837d54ce963ad63ddf8df2e47230800b747 (patch)
tree17936dddb5551ff9034a2295d6d283dbcad7bf66
parent85c56d96f609c4ad458f0963a068386cc910c66c (diff)
Renamed variables
-rw-r--r--ot/lp/__init__.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/ot/lp/__init__.py b/ot/lp/__init__.py
index ab7cb97..1238cdb 100644
--- a/ot/lp/__init__.py
+++ b/ot/lp/__init__.py
@@ -95,13 +95,13 @@ def emd(a, b, M, num_iter_max=100000, log=False):
b = np.ones((M.shape[1],), dtype=np.float64) / M.shape[1]
G, cost, u, v, result_code = emd_c(a, b, M, num_iter_max)
- resultCodeString = check_result(result_code)
+ result_code_string = check_result(result_code)
if log:
log = {}
log['cost'] = cost
log['u'] = u
log['v'] = v
- log['warning'] = resultCodeString
+ log['warning'] = result_code_string
log['result_code'] = result_code
return G, log
return G
@@ -184,12 +184,12 @@ def emd2(a, b, M, processes=multiprocessing.cpu_count(), num_iter_max=100000, lo
if log:
def f(b):
G, cost, u, v, resultCode = emd_c(a, b, M, num_iter_max)
- resultCodeString = check_result(resultCode)
+ result_code_string = check_result(resultCode)
log = {}
log['G'] = G
log['u'] = u
log['v'] = v
- log['warning'] = resultCodeString
+ log['warning'] = result_code_string
log['result_code'] = resultCode
return [cost, log]
else: