- Implement CS2 min-cost-flow adaptor and generalize common min-cost-flow stuff

[match/match.git] / program / ProposalMatcherConfig.hs

diff --git a/program/ProposalMatcherConfig.hs b/program/ProposalMatcherConfig.hs
index 750cf1f..90bc9b1 100644 (file)
--- a/program/ProposalMatcherConfig.hs
+++ b/program/ProposalMatcherConfig.hs
@@ -1,5 +1,18 @@
-module ProposalMatcherConfig where
-import Instance
+module ProposalMatcherConfig
+       (module ProposalMatcherConfig, minCostFlow) where
+
+-- Choose a min-cost flow implementation (timings on mattlaptop2):
+
+-- A naive implementation that is slow for all but the smallest instances
+-- (30s on a 20x50 example).
+import NaiveMinCostFlow
+
+-- Uses CS2 (http://www.igsystems.com/cs2/), which requires a license for
+-- non-research use but is faster (<1s on a 20x50 example, 64s on a 60x500
+-- example).  Configure the path to cs2.exe in CS2MinCostFlow.hs.
+--import CS2MinCostFlow
+
+type Wt = Double -- Can be any RealFrac.
 
 type Pref = Int