Matt McCutchen's Web Site
/
match
/
match.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Implement CS2 min-cost-flow adaptor and generalize common min-cost-flow stuff
[match/match.git]
/
program
/
InstanceGenerator.hs
diff --git
a/program/InstanceGenerator.hs
b/program/InstanceGenerator.hs
index
23b20a1
..
ab56d5f
100644
(file)
--- a/
program/InstanceGenerator.hs
+++ b/
program/InstanceGenerator.hs
@@
-65,6
+65,7
@@
randomInstance numRvrs numProps = do
jj = proposalInfos ! j
topicPref = case fst jj of
PTopic1 t1 -> expertnessToPref (ii ! t1)
jj = proposalInfos ! j
topicPref = case fst jj of
PTopic1 t1 -> expertnessToPref (ii ! t1)
- PTopic2 t1 t2 -> (expertnessToPref (ii ! t1) + expertnessToPref (ii ! t2)) / 2
+ PTopic2 t1 t2 -> (expertnessToPref (ii ! t1)
+ + expertnessToPref (ii ! t2)) / 2
in topicPref * snd jj - 4)
return $ Instance numRvrs numProps loadA prefA
in topicPref * snd jj - 4)
return $ Instance numRvrs numProps loadA prefA