Changeset 306 for trunk/leaguerunner

Timestamp:

08/11/05 09:27:17 (5 years ago)

Author:

dan

Message:

 

Location:

trunk/leaguerunner/src

Files:

• classes/league.inc (modified) (7 diffs)
• includes/common.inc (modified) (1 diff)

trunk/leaguerunner/src/classes/league.inc

@@ -930 +930 @@
 
                 # sort team's so that pyramid scheme can work properly
-      // TODO: MAKE SURE TO TEST THIS....... IT'S NOT FULLY TESTED!!!!!!
-                // HACK: ugly... have to call the calculate_standings method to be able to get
-      //  game info so that the ladder sort can use SOTG as the second criteria...
-      // Otherwise, I could just do:
-      //   $teams = $this->teams;
-      //   uasort($teams, 'standings_sort_ladder_tony');
       $teams = array();
       list($team_ids, $junk, $morejunk) = $this->calculate_standings();
@@ -1088 +1082 @@
     * This does the actual work of scheduling a one set pyramid set of games.
     * However it has some problems where it may not properly schedule all
-    * the games.  If it runs into problems then we use the wrapper 
+    * the games.  If it runs into problems then we use the wrapper
     * function that calls this one to retry it.
+    * If any problems are found then this function rolls back it's changes.
     */
-        function schedule_one_set_pyramid_try( $teams, 
-                                          $datestamp, 
+    function schedule_one_set_pyramid_try( $teams,
+                                          $datestamp,
                                           $games_before_repeat
                                         )
-        {
-      //TODO: use transactions
-                $rollback_list = array();
+    {
+      $rollback_list = array();
 
       $versus_team1 = array();
@@ -1126 +1120 @@
          $team = array_shift($teams);
          // gotta load this team's games to see who they've played recently...
-         $past_games = game_load_many( array( 'either_team' => $team->team_id, 
+         $past_games = game_load_many( array( 'either_team' => $team->team_id,
                                               '_order' => 'g.game_date') );
          if ($past_games == null)
@@ -1200 +1194 @@
          $versus_team1[] = $team;
          $versus_team2[] = $opponent;
-
-         //print "Matching " . $team->team_id . " " . $opponent->team_id . "\n";
       }
 
@@ -1224 +1216 @@
          list($rc, $message) = $g->select_weighted_gameslot($datestamp);
          if( ! $rc ) {
-            print "$rc: $message";
-            // Argh, something failed, so roll back the whole pile of games 
+            // something failed, so roll back the whole pile of games
             foreach( $rollback_list as $to_rollback ) {
                if( ! $to_rollback->delete() ) {
@@ -1252 +1243 @@
          for ($j = 0; $j < $max_retries; $j++) {
             /*
-            * this returns "REPEAT" if it needs to get repeated
+            * if we get back "REPEAT" then we can try again because it didn't work
+            * in finding a set of matches for everyone given the paramters we gave it.
+            * After a while we lower our requirements and try again.  The randomizing
+            * inside this function will make it work sometimes and fail others, but
+            * eventually we'll get a good matchup.
             */
             $ret = $this->schedule_one_set_pyramid_try( $teams, $datestamp, $i);
@@ -1431 +1426 @@
 }
 
-function standings_sort_ladder_tony (&$a, &$b) 
-{
-   /* Check Rank */
-   if ($a->rank != $b->rank) {
-      return ($a->rank < $b->rank) ? -1 : 1;
-   }
-
-   /* Check SOTG */
-   if($a->games > 0 && $b->games > 0) {
-      if( ($a->spirit / $a->games) > ($b->spirit / $b->games)) {
-         return -1;
-      } else if( ($a->spirit / $a->games) < ($b->spirit / $b->games)) {
-         return 1;
-      }
-   }
-   return 0;
-}
-
 ?>

trunk/leaguerunner/src/includes/common.inc

@@ -296 +296 @@
 
   $base_url = $BASE_URL;
-  $cleanURL = variable_get('clean_url', 1);
+  $cleanURL = variable_get('clean_url', 0);
 
   if (empty($script)) {