Skip to content
Snippets Groups Projects
Commit 6fe37cdf authored by Joan Solà Ortega's avatar Joan Solà Ortega
Browse files

Fix a number of warnings related to int / unsigned int types

parent 6559cbea
No related branches found
No related tags found
No related merge requests found
......@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
//Fill A & b
A.insert(0, 0) = 5;
b(0) = 1;
for (unsigned int i = 1; i < size; i++)
for (int i = 1; i < size; i++)
{
A.insert(i, i) = 5;
A.insert(i, i - 1) = 1;
......
......@@ -46,7 +46,7 @@ void permutation_2_block_permutation(const PermutationMatrix<Dynamic, Dynamic, i
{
ArrayXXi idx(dim, size);
idx.row(0) = dim * perm.indices().transpose();
for (unsigned int i = 1; i<dim; i++)
for (int i = 1; i<dim; i++)
idx.row(i) = idx.row(i-1) + 1;
Map<ArrayXi> idx_blocks(idx.data(), dim*size, 1);
perm_blocks.indices() = idx_blocks;
......@@ -82,7 +82,7 @@ int main(int argc, char *argv[])
// BUILD THE PROBLEM ----------------------------
//Fill H & b
for (unsigned int i = 0; i < size; i++)
for (int i = 0; i < size; i++)
{
addSparseBlock(5*omega, H, i*dim, i*dim);
FactorMatrix.insert(i,i) = 1;
......
......@@ -80,7 +80,7 @@ void permutation_2_block_permutation(const PermutationMatrix<Dynamic, Dynamic, i
ArrayXXi idx(dim, perm_nodes.indices().rows());
idx.row(0) = dim * perm_nodes.indices().transpose();
for (unsigned int i = 1; i<dim; i++)
for (int i = 1; i<dim; i++)
idx.row(i) = idx.row(i-1) + 1;
Map<ArrayXi> idx_blocks(idx.data(), dim*perm_nodes.indices().rows(), 1);
perm_variables.indices() = idx_blocks;
......@@ -141,7 +141,7 @@ int main(int argc, char *argv[])
// GENERATING MEASUREMENTS
std::vector<std::vector<int>> measurements;
for (unsigned int i = 0; i < size; i++)
for (int i = 0; i < size; i++)
{
std::vector<int> meas(0);
if (i == 0) //prior
......
......@@ -157,6 +157,10 @@ class SolverQR
acc_node_permutation_(0),
// nodes_(0),
// measurements_(0),
first_ordered_node_(0),
t_ordering_(0),
t_solving_(0),
t_managing_(0),
time_ordering_(0),
time_solving_(0),
time_managing_(0)
......@@ -446,7 +450,7 @@ class SolverQR
// update nodes orders and locations
ArrayXi locations = perm_nodes_2_locations(acc_node_permutation_);
for (int i = 0; i < nodes_.size(); i++)
for (unsigned int i = 0; i < nodes_.size(); i++)
{
nodes_.at(i).order = acc_node_permutation_.indices()(i);
nodes_.at(i).location = locations(i);
......@@ -503,7 +507,7 @@ int main(int argc, char *argv[])
// GENERATING MEASUREMENTS
std::vector<measurement> measurements;
for (unsigned int i = 0; i < size; i++)
for (int i = 0; i < size; i++)
{
std::vector<int> meas(0);
if (i == 0) //prior
......
......@@ -48,7 +48,7 @@ void permutation_2_block_permutation(const PermutationMatrix<Dynamic, Dynamic, i
ArrayXXi idx(dim, size);
idx.row(0) = dim * perm.indices().transpose();
for (unsigned int i = 1; i<dim; i++)
for (int i = 1; i<dim; i++)
idx.row(i) = idx.row(i-1) + 1;
Map<ArrayXi> idx_blocks(idx.data(), dim*size, 1);
perm_blocks.indices() = idx_blocks;
......@@ -108,7 +108,7 @@ int main(int argc, char *argv[])
std::cout << "STARTING INCREMENTAL TEST" << std::endl << std::endl;
// INCREMENTAL LOOP
for (unsigned int i = 1; i < size; i++)
for (int i = 1; i < size; i++)
{
std::cout << "========================= STEP " << i << ":" << std::endl;
// AUGMENT THE PROBLEM ----------------------------
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment