forked from science-ation/science-ation
fix a few typos in the annealer, and bump up the moves to 1000 for better results
This commit is contained in:
parent
c5e55fad37
commit
738aaeb172
@ -281,7 +281,7 @@ function judges_assign_anneal($divisions, $categories, $languages, $judges, &$te
|
|||||||
/* Anneal */
|
/* Anneal */
|
||||||
$temperature = 25.0;
|
$temperature = 25.0;
|
||||||
while(1) {
|
while(1) {
|
||||||
$moves = 750;
|
$moves = 1000;
|
||||||
for($m = 0; $m<$moves; $m++) {
|
for($m = 0; $m<$moves; $m++) {
|
||||||
/* Pick 2 moves at random */
|
/* Pick 2 moves at random */
|
||||||
$move = pick_random_move($team);
|
$move = pick_random_move($team);
|
||||||
@ -456,7 +456,7 @@ foreach($div AS $d_id=>$d_val)
|
|||||||
if($j==$numteams) $j=0;
|
if($j==$numteams) $j=0;
|
||||||
}
|
}
|
||||||
$x++;
|
$x++;
|
||||||
/* If we've used all the judging temas, of we've assigned judges equal
|
/* If we've used all the judging teams, of we've assigned judges equal
|
||||||
* to the number of projects, it's time for the next timeslot */
|
* to the number of projects, it's time for the next timeslot */
|
||||||
if(count($teams_at_this_ts) == $numteams || count($teams_at_this_ts) == $num) {
|
if(count($teams_at_this_ts) == $numteams || count($teams_at_this_ts) == $num) {
|
||||||
$ts++;
|
$ts++;
|
||||||
@ -613,9 +613,9 @@ while(list($proj_id, $projinfo) = each( $data['projects'] )) {
|
|||||||
print("<td> </td>");
|
print("<td> </td>");
|
||||||
$last_slot++;
|
$last_slot++;
|
||||||
}
|
}
|
||||||
print("<td>".($jteam+1));
|
print("<td>#".($jteam+1));
|
||||||
echo "<br />";
|
echo "<br />";
|
||||||
echo "tema_id=".$team[$jteam]['team_id'];
|
echo "team_id=".$team[$jteam]['team_id'];
|
||||||
echo "<br />";
|
echo "<br />";
|
||||||
echo "proj_id=".$proj_id;
|
echo "proj_id=".$proj_id;
|
||||||
echo "<br />";
|
echo "<br />";
|
||||||
|
Loading…
Reference in New Issue
Block a user