caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates from clangformat

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/place_sa.cc
View File

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

9
frontend/json/jsonparse.cc
View File

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