always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix min_cost_flow on windows

Browse Source
This commit is contained in:
lperron@google.com
2011-04-06 16:26:35 +00:00
parent cc9e2a169c
commit 728bbaabee
10 changed files with 107 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -18,7 +18,7 @@ include Makefile.def
# Then we overwrite the local ones if the Makefile.local file exists.
-include Makefile.local
# Then include specific unix commands and definitions
# Then include specific system commands and definitions
include Makefile.$(SYSTEM)
# Include build files.

22
Makefile.build.cpp
View File

@@ -56,16 +56,16 @@ ALGORITHMS_LIBS = \
algorithmslibs: $(ALGORITHMS_LIBS)
clean:
rm -f *.$(LIBSUFFIX)
rm -f objs/*.$O
rm -f $(CPBINARIES)
rm -f $(LPBINARIES)
rm -f gen/*/*wrap*
rm -f gen/*/*.pb.*
rm -f objs/com/google/ortools/*/*.class
rm -f gen/com/google/ortools/*/*.java
rm -f *.so
rm -f *.jar
$(DEL) *.$(LIBSUFFIX)
$(DEL) objs/*.$O
$(DEL) $(CPBINARIES)
$(DEL) $(LPBINARIES)
$(DEL) gen/*/*wrap*
$(DEL) gen/*/*.pb.*
$(DEL) objs/com/google/ortools/*/*.class
$(DEL) gen/com/google/ortools/*/*.java
$(DEL) *.so
$(DEL) *.jar
# Constraint Solver Lib.
@@ -219,7 +219,7 @@ gen/linear_solver/linear_solver.pb.cc:linear_solver/linear_solver.proto
gen/linear_solver/linear_solver.pb.h:gen/linear_solver/linear_solver.pb.cc
$(LIBPREFIX)linear_solver.$(LIBSUFFIX): $(LINEAR_SOLVER_LIB_OS)
$(LINKCMD) $(LINKPREFIX)liblinear_solver.$(LIBSUFFIX) $(LINEAR_SOLVER_LIB_OS)
$(LINKCMD) $(LINKPREFIX)linear_solver.$(LIBSUFFIX) $(LINEAR_SOLVER_LIB_OS)
# Util library.

38
Makefile.build.python
View File

@@ -2,7 +2,7 @@
# pywrapknapsack_solver
pyalgorithms: _pywrapknapsack_solver.$(PYLIBEXT) gen/algorithms/pywrapknapsack_solver.py $(ALGORITHMS_LIBS) $(BASE_LIBS)
pyalgorithms: _pywrapknapsack_solver.$(SHAREDLIBEXT) gen/algorithms/pywrapknapsack_solver.py $(ALGORITHMS_LIBS) $(BASE_LIBS)
gen/algorithms/pywrapknapsack_solver.py: algorithms/knapsack_solver.swig algorithms/knapsack_solver.h base/base.swig
$(SWIG_BINARY) -c++ -python -o gen/algorithms/knapsack_solver_wrap.cc -module pywrapknapsack_solver algorithms/knapsack_solver.swig
@@ -13,11 +13,13 @@ objs/knapsack_solver_wrap.$O: gen/algorithms/knapsack_solver_wrap.cc
$(CCC) $(CFLAGS) $(PYTHON_INC) -c gen/algorithms/knapsack_solver_wrap.cc $(OBJOUT)objs/knapsack_solver_wrap.$O
_pywrapknapsack_solver.$(SHAREDLIBEXT): objs/knapsack_solver_wrap.$O $(ALGORITHMS_LIBS) $(BASE_LIBS)
$(LD) $(LDOUT)_pywrapknapsack_solver.$(SHAREDLIBEXT) objs/knapsack_solver_wrap.$O $(ALGORITHMS_LIBS) $(BASE_LIBS) $(LDFLAGS)
$(LD) $(LDOUT)_pywrapknapsack_solver.$(SHAREDLIBEXT) objs/knapsack_solver_wrap.$O $(ALGORITHMS_LIBS) $(BASE_LIBS) $(LDFLAGS) $(PYTHON_LNK)
ifeq "$(SYSTEM)" "win"
copy _pywrapknapsack_solver.dll gen\\knapsack_solver\\_pywrapknapsack_solver.pyd
endif
# pywrapflow
pygraph: _pywrapflow.$(PYLIBEXT) gen/graph/pywrapflow.py $(GRAPH_LIBS) $(BASE_LIBS)
pygraph: _pywrapflow.$(SHAREDLIBEXT) gen/graph/pywrapflow.py $(GRAPH_LIBS) $(BASE_LIBS)
gen/graph/pywrapflow.py: graph/flow.swig graph/min_cost_flow.h graph/max_flow.h graph/ebert_graph.h base/base.swig
$(SWIG_BINARY) -c++ -python -o gen/graph/pywrapflow_wrap.cc -module pywrapflow graph/flow.swig
@@ -28,11 +30,14 @@ objs/pywrapflow_wrap.$O: gen/graph/pywrapflow_wrap.cc
$(CCC) $(CFLAGS) $(PYTHON_INC) -c gen/graph/pywrapflow_wrap.cc $(OBJOUT)objs/pywrapflow_wrap.$O
_pywrapflow.$(SHAREDLIBEXT): objs/pywrapflow_wrap.$O $(GRAPH_LIBS) $(BASE_LIBS)
$(LD) $(LDOUT)_pywrapflow.$(SHAREDLIBEXT) objs/pywrapflow_wrap.$O $(GRAPH_LIBS) $(BASE_LIBS) $(LDFLAGS)
$(LD) $(LDOUT)_pywrapflow.$(SHAREDLIBEXT) objs/pywrapflow_wrap.$O $(GRAPH_LIBS) $(BASE_LIBS) $(LDFLAGS) $(PYTHON_LNK)
ifeq "$(SYSTEM)" "win"
copy _pywrapcp.dll gen\\graph\\_pywrapflow.pyd
endif
# pywrapcp
pycp: _pywrapcp.$(PYLIBEXT) gen/constraint_solver/pywrapcp.py _pywraprouting.$(PYLIBEXT) gen/constraint_solver/pywraprouting.py $(CP_LIBS) $(BASE_LIBS)
pycp: _pywrapcp.$(SHAREDLIBEXT) gen/constraint_solver/pywrapcp.py _pywraprouting.$(SHAREDLIBEXT) gen/constraint_solver/pywraprouting.py $(CP_LIBS) $(BASE_LIBS)
gen/constraint_solver/pywrapcp.py: constraint_solver/constraint_solver.swig constraint_solver/constraint_solver.h constraint_solver/constraint_solveri.h base/base.swig
$(SWIG_BINARY) -c++ -python -o gen/constraint_solver/constraint_solver_wrap.cc -module pywrapcp constraint_solver/constraint_solver.swig
@@ -43,7 +48,11 @@ objs/constraint_solver_wrap.$O: gen/constraint_solver/constraint_solver_wrap.cc
$(CCC) $(CFLAGS) $(PYTHON_INC) -c gen/constraint_solver/constraint_solver_wrap.cc $(OBJOUT)objs/constraint_solver_wrap.$O
_pywrapcp.$(SHAREDLIBEXT): objs/constraint_solver_wrap.$O $(CP_LIBS) $(BASE_LIBS)
$(LD) $(LDOUT)_pywrapcp.$(SHAREDLIBEXT) objs/constraint_solver_wrap.$O $(CP_LIBS) $(BASE_LIBS) $(LDFLAGS)
$(LD) $(LDOUT)_pywrapcp.$(SHAREDLIBEXT) objs/constraint_solver_wrap.$O $(CP_LIBS) $(BASE_LIBS) $(LDFLAGS) $(PYTHON_LNK)
ifeq "$(SYSTEM)" "win"
copy _pywrapcp.dll gen\\constraint_solver\\_pywrapcp.pyd
endif
# pywraprouting
@@ -56,14 +65,17 @@ objs/routing_wrap.$O: gen/constraint_solver/routing_wrap.cc
$(CCC) $(CFLAGS) $(PYTHON_INC) -c gen/constraint_solver/routing_wrap.cc $(OBJOUT)objs/routing_wrap.$O
_pywraprouting.$(SHAREDLIBEXT): objs/routing_wrap.$O $(CP_LIBS) $(BASE_LIBS)
$(LD) $(LDOUT)_pywraprouting.$(SHAREDLIBEXT) objs/routing_wrap.$O $(CP_LIBS) $(BASE_LIBS) $(LDFLAGS)
$(LD) $(LDOUT)_pywraprouting.$(SHAREDLIBEXT) objs/routing_wrap.$O $(CP_LIBS) $(BASE_LIBS) $(LDFLAGS) $(PYTHON_LNK)
ifeq "$(SYSTEM)" "win"
copy _pywraprouting.dll gen\\constraint_solver\\_pywraprouting.pyd
endif
# pywraplp
pylp: _pywraplp.$(PYLIBEXT) gen/linear_solver/pywraplp.py $(LP_LIBS) $(BASE_LIBS)
pylp: _pywraplp.$(SHAREDLIBEXT) gen/linear_solver/pywraplp.py $(LP_LIBS) $(BASE_LIBS)
gen/linear_solver/pywraplp.py: linear_solver/linear_solver.swig linear_solver/linear_solver.h gen/linear_solver/linear_solver.pb.h base/base.swig
$(SWIG_BINARY) $(CLP_INC) $(CBC_INC) $(GLPK_INC) -c++ -python -o gen/linear_solver/linear_solver_wrap.cc -module pywraplp linear_solver/linear_solver.swig
$(SWIG_BINARY) $(CLP_SWIG) $(CBC_SWIG) $(GLPK_SWIG) -c++ -python -o gen/linear_solver/linear_solver_wrap.cc -module pywraplp linear_solver/linear_solver.swig
gen/linear_solver/linear_solver_wrap.cc: gen/linear_solver/pywraplp.py
@@ -71,4 +83,8 @@ objs/linear_solver_wrap.$O: gen/linear_solver/linear_solver_wrap.cc
$(CCC) $(CFLAGS) $(PYTHON_INC) -c gen/linear_solver/linear_solver_wrap.cc $(OBJOUT)objs/linear_solver_wrap.$O
_pywraplp.$(SHAREDLIBEXT): objs/linear_solver_wrap.$O $(LP_LIBS) $(BASE_LIBS)
$(LD) $(LDOUT)_pywraplp.$(SHAREDLIBEXT) objs/linear_solver_wrap.$O $(LP_LIBS) $(BASE_LIBS) $(LDLPDEPS) $(LDFLAGS)
$(LD) $(LDOUT)_pywraplp.$(SHAREDLIBEXT) objs/linear_solver_wrap.$O $(LP_LIBS) $(BASE_LIBS) $(LDLPDEPS) $(LDFLAGS) $(PYTHON_LNK)
ifeq "$(SYSTEM)" "win"
copy _pywraplp.dll gen\\linear_solver\\_pywraplp.pyd
endif

31
Makefile.def
View File

@@ -20,13 +20,42 @@ UNIX_CBC_DIR=../cbc-2.6.2
UNIX_GLPK_DIR=../glpk-4.45
# Linux jdk root
# first, determine 32 or 64 bits.
ifeq "$(SYSTEM)" "unix"
LBITS := $(shell getconf LONG_BIT)
ifeq ($(LBITS),64)
JDK_EXT=64
else
JDK_EXT=32
endif
endif
LINUX_JDK_ROOT=/usr/local/buildtools/java/jdk-$(JDK_EXT)
# Include files path for java on mac os X
MAC_JDK_HEADERS=/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/include
#MAC_JDK_HEADERS=/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/bundle/Headers
#MAC_JDK_HEADERS=/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/bundle/Headers
# Please edit the following:
WINDOWS_GFLAGS_DIR=..\\gflags-1.4
WINDOWS_ZLIB_DIR=..\\zlib-1.2.5
WINDOWS_ZLIB_NAME=zlib.lib
WINDOWS_SWIG_BINARY=..\\swigwin-2.0.0\\swig.exe
WINDOWS_PROTOBUF_DIR=..\\protobuf-2.3.0
WINDOWS_PYTHON_DIR=c:\\Python27
WINDOWS_PYTHON_LIB=c:\\Python27\\libs\\python27.lib
# This is the root directory of the CLP installation. Please undefine if CLP is
# not installed. If you have installed CBC, CLP_DIR can have the same value as
# CBC_DIR.
WINDOWS_CLP_DIR=..\\cbc-2.6.2
# This is the root directory of the CBC installation. Please undefine if CBC is
# not installed.
WINDOWS_CBC_DIR=..\\cbc-2.6.2
# This is the root directory of glpk installation. Please undefine if GLPK is
# not installed.
WINDOWS_GLPK_VER=4_45
WINDOWS_GLPK_DIR=..\\glpk-4.45
# This describes the python installation.
WINDOWS_PYTHON_INC=/Ic:\\Python27\\include
WINDOWS_PYTHON_LNK=c:\\Python27\\libs\\python27.lib

5
Makefile.unix
View File

@@ -18,14 +18,17 @@ endif
# This is needed to find Coin LP include files.
ifdef UNIX_CLP_DIR
CLP_INC = -I$(UNIX_CLP_DIR)/include -DUSE_CLP
CLP_SWIG = $(CLP_INC)
endif
# This is needed to find Coin Branch and Cut include files.
ifdef UNIX_CBC_DIR
CBC_INC = -I$(UNIX_CBC_DIR)/include -DUSE_CBC
CBC_SWIG = $(CBC_INC)
endif
# This is needed to find GLPK include files.
ifdef UNIX_GLPK_DIR
GLPK_INC = -I$(UNIX_GLPK_DIR)/include -DUSE_GLPK
GLPK_SWIG = $(GLPK_INC)
endif
# Compilation flags
@@ -108,9 +111,9 @@ LINKCMD=ar rv
LINKPREFIX=
O=o
E=
PYLIBEXT=so
SHAREDLIBEXT=so
SPACE=$(subst ', ,'$(TEMPSPACE)) # Horrible trick to get a space in a var.
LDOUT=-o$(SPACE)
OBJOUT=-o
EXEOUT=-o$(SPACE)
DEL=rm -f

25
examples/network_routing.cc
View File

@@ -92,6 +92,26 @@ DEFINE_int32(lns_limit, 30, "Limit the number of failures of the lns loop.");
DEFINE_bool(focus_lns, true, "Focus LNS on highest cost arcs.");
namespace operations_research {
namespace {
#if defined(_MSC_VER)
// The following class defines a hash function for arcs
class ArcHasher : public stdext::hash_compare <pair<int, int> > {
public:
size_t operator() (const pair<int, int>& a) const {
uint32 x = a.first;
uint32 y = 0x9e3779b9UL;
uint32 z = a.second;
mix(x, y, z);
return z;
}
bool operator() (const pair<int, int>& a1, const pair<int, int>& a2) const {
return a1.first < a2.first ||
(a1.first == a2.first && a1.second < a2.second);
}
};
#endif
}
// ---------- Data and Data Generation ----------
// ----- Data -----
@@ -145,8 +165,13 @@ class NetworkRoutingData {
int num_nodes_;
int max_capacity_;
int fixed_charge_cost_;
#if defined(_MSC_VER)
hash_map<pair<int, int>, int, ArcHasher> all_arcs_;
hash_map<pair<int, int>, int, ArcHasher> all_demands_;
#else
hash_map<pair<int, int>, int> all_arcs_;
hash_map<pair<int, int>, int> all_demands_;
#endif
};
// ----- Data Generation -----

4
graph/min_cost_flow.cc
View File

@@ -1,4 +1,4 @@
// Copyright 2010 Google
// Copyright 2010 Google
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
@@ -88,10 +88,12 @@ bool MinCostFlow::CheckCostRange() const {
}
VLOG(1) << "Min cost magnitude = " << min_cost_magnitude
<< ", Max cost magnitude = " << max_cost_magnitude;
#if !defined(_MSC_VER)
CHECK_GE(log(std::numeric_limits<CostValue>::max()),
log(max_cost_magnitude) + log(graph_.num_nodes() + 1))
<< "Maximum cost is too high for the number of nodes. "
<< "Try changing the data.";
#endif
return true;
}

1
graph/shortestpaths.cc
View File

@@ -19,5 +19,6 @@
#include "base/integral_types.h"
#include "base/logging.h"
#include "base/macros.h"
DEFINE_int32(shortestpaths_disconnected_distance, 200000,
"Distance returned when two node are disconnected");

4
linear_solver/cbc_interface.cc
View File

@@ -38,7 +38,11 @@
#include "coin/CglClique.hpp"
#include "coin/CglFlowCover.hpp"
#include "coin/CglMixedIntegerRounding.hpp"
#if defined(_MSC_VER)
#include "coin/configall_system.h"
#else
#include "coin/config_cbc.h"
#endif
// Heuristics

2
util/packed_array.h
View File

@@ -16,7 +16,7 @@
#if defined(__APPLE__) && defined(__GNUC__)
#include <machine/endian.h>
#else
#elif !defined(_MSC_VER)
#include <endian.h>
#endif
#include <limits.h>