Updates from clangformat

Signed-off-by: Clifford Wolf <clifford@clifford.at>
This commit is contained in:
Clifford Wolf 2018-06-20 12:57:59 +02:00
parent cb9c6c6ef2
commit 7c3593ea5a
2 changed files with 9 additions and 9 deletions

View File

@ -374,8 +374,9 @@ class SAPlacer
delta = new_wirelength - curr_wirelength;
n_move++;
// SA acceptance criterea
if (delta < 0 || (temp > 1e-6 && (ctx->rng() / float(0x3fffffff)) <=
std::exp(-delta / temp))) {
if (delta < 0 ||
(temp > 1e-6 &&
(ctx->rng() / float(0x3fffffff)) <= std::exp(-delta / temp))) {
n_accept++;
if (delta < 0)
improved = true;

View File

@ -26,8 +26,8 @@
#include <fstream>
#include <iostream>
#include <log.h>
#include <string>
#include <map>
#include <string>
#include "nextpnr.h"
NEXTPNR_NAMESPACE_BEGIN
@ -749,12 +749,11 @@ void json_import(Context *ctx, string modname, JsonNode *node)
int netid = bits->data_array.at(i)->data_number;
if (netid >= netnames.size())
netnames.resize(netid + 1);
netnames.at(netid) =
ctx->id(basename +
(num_bits == 1 ? ""
: std::string("[") +
std::to_string(i) +
std::string("]")));
netnames.at(netid) = ctx->id(
basename +
(num_bits == 1 ? "" : std::string("[") +
std::to_string(i) +
std::string("]")));
}
}
}