Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
main: main.cpp full_bipartitegraph.h network_simplex_simple.h
g++ -std=c++11 -Ofast -march=native -fno-signed-zeros -fno-trapping-math -fopenmp -openmp -frename-registers -funroll-loops main.cpp -o transport
#g++ -std=c++11 -Ofast -march=native -fno-signed-zeros -fno-trapping-math -fopenmp -frename-registers -funroll-loops -D_GLIBCXX_PARALLEL main.cpp
$(CXX) -std=c++11 -Ofast -march=native -fno-signed-zeros -fno-trapping-math -fopenmp -openmp -frename-registers -funroll-loops main.cpp -o transport
#g++ -std=c++11 -Ofast -march=native -fno-signed-zeros -fno-trapping-math -fopenmp -frename-registers -funroll-loops -D_GLIBCXX_PARALLEL main.cpp
10 changes: 5 additions & 5 deletions full_bipartitegraph.h
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/* -*- mode: C++; indent-tabs-mode: nil; -*-
*
* This file has been adapted by Nicolas Bonneel (2013),
* This file has been adapted by Nicolas Bonneel (2013),
* from full_graph.h from LEMON, a generic C++ optimization library,
* to implement a lightweight fully connected bipartite graph. A previous
* version of this file is used as part of the Displacement Interpolation
* project,
* version of this file is used as part of the Displacement Interpolation
* project,
* Web: http://www.cs.ubc.ca/labs/imager/tr/2011/DisplacementInterpolation/
*
*
*
**** Original file Copyright Notice :
* Copyright (C) 2003-2010
Expand Down Expand Up @@ -73,7 +73,7 @@ namespace lemon {

int _node_num;
int64_t _arc_num;

FullBipartiteDigraphBase() {}

void construct(int n1, int n2) { _node_num = n1+n2; _arc_num = (int64_t)n1 * (int64_t)n2; _n1=n1; _n2=n2;}
Expand Down
4 changes: 2 additions & 2 deletions main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@

#include <iostream>
#include <vector>

#include "network_simplex_simple.h"
#include <chrono>

#include <stdio.h>



using namespace lemon;

// all types should be signed
Expand Down Expand Up @@ -111,4 +111,4 @@ int main() {
std::cout << "EMD = "<<resultdist<<" == "<<recomputed_cost << std::endl;

return 0;
}
}
Loading