Commit Graph

58 Commits

Author SHA1 Message Date
dennis
2e303635ea Changes to facilitate running in Windows OS IIS or Apache werb server 2011-03-15 20:28:10 +00:00
jacob
b9bcb127a6 Updated these tables to include the conference id:
award_awards
	award_prizes
	award_types
	award_awards_projectcategories
	award_awards_projectdivisions
	winners
	students
	projects
	registrations

Also modified all code that uses those tables to work with the conference id
instead of the year, with the exception of these files:
	communication.inc.php
	reports_students.inc.php
	rerollprizes.php
	remote.php
The "rerollprizes.php" probably doesn't matter, having been a one-time usage
file anyway.  The others will need to be modified in the future to correctly
use the conference id instead of the year.
2010-10-20 21:58:26 +00:00
james
2292af3206 Use div_prefs and cat_prefs (make the scheduler work again)
Give higher preference to not having leftover judges
Treat 'indifferent' cat_prefs as cost=0 even though its a 2 (on the 0-4 scale)
2010-09-22 18:28:51 +00:00
james
534981a0b9 Make division preferences have slightly higher priority than category preferences.
Add an additional (fairly large) cost for creating a completely empty team

Change the experience to use a weighted experience instead of a sum, and give a
weighted cost to teams for less than 5 years weighted experience, but onyl if there's 
more than 1 person on the team (1 person teams are not penalized for not having any experience)
2010-04-06 15:41:29 +00:00
james
951b7209d9 Add a cost for judges assigned to a team that speak more languages than they need for that team
(ie, a bilingual judge being used for an english-only team)
2010-04-06 14:42:51 +00:00
dave
0661224a0b Don't duplicate SA-only judges for all rounds for all special awards (only duplicate them enough to satisfy their special awards requests in the specific rounds the award is judges). Fix a bug where the last jduges would get replcaed by a duplicate of the 2nd last judge for multi-round special awards. 2010-04-03 23:10:05 +00:00
dave
8f063c1ec1 My what a difference an equal sign makes. 2010-04-03 20:54:57 +00:00
dave
9a00ce4877 Properly do timeslot->project->jteam linking for special awards 2010-04-03 19:16:11 +00:00
james
8e650a104d Higher preference for having the right languages on a team 2010-02-17 18:59:56 +00:00
dave
573a580e3a Add a small cost for judge teams with no experience, try to avoid that. 2010-02-17 18:34:35 +00:00
dave
d4782758aa Don't use round2 scoring in the cost funciton if there is no round2 2010-02-17 18:34:29 +00:00
dave
147655171c Skip round2 judge scheduling if no round2 timeslots are defined. 2010-02-17 18:24:07 +00:00
james
c67488d375 If availability is disabled, dont fail loading judges
Fix the team languages array
Fix the timeslots checks for schedulerconfig (need round AND timeslots, not just a round)
2010-01-18 16:24:34 +00:00
james
c729e0f8da Dont let the scheduler run if we have 0 judges available - timmins was in an endless loop since last nite 2010-01-15 14:53:24 +00:00
james
f963dbf276 Merge all changes from branch r1284:1498 into trunk 2009-09-09 00:26:12 +00:00
james
bfb471011a - Fix a bug where the special awards annealer would overwrite the last jteam
- Add an alternative (but commented out) array population for the annealer
- Leave in some of the debug statements, they don't hurt anything.
2008-09-17 18:04:50 +00:00
james
4d0ff8f327 properly fix the team naming/sorting issue 2008-09-16 19:38:27 +00:00
james
de185f07f4 sort the divs and cats so the team names are consistent 2008-09-16 18:37:23 +00:00
james
8b250c8997 Fix a bug where the scheduler was allowing deleted judges to be used 2008-03-29 20:59:14 +00:00
james
5458a5809e Fix a bug where judging teams containing apostrophe's wasnt being created, but it was using an old ID from a previous insert, so judges were being linked to teams that didnt exist... then the records became orphaned and couldnt be deleted. 2008-03-29 20:48:39 +00:00
james
572242bc14 Only consider judges teams from the current fair year when calculating what judging team number to start numbering at 2008-03-29 19:02:43 +00:00
james
3a1b4cca15 - Ignore jdiv 0 in the annealer and in the check. jdiv 0 is what all unassigned divs/cats get,
and if they're unassigned we don't want to schedule them.
- Fix a typo in the language selection
2008-02-28 20:23:27 +00:00
dave
1aadc76ebc - The awards store whether to schedule judges for a special award
(schedule_judges).  We should obey that even though it's always set to 'yes'
  and there's no way for a user to change it.. yet.
2007-12-22 09:36:23 +00:00
dave
0db1467da7 - Fix errors, crashes, infinite loops caused by jdivs with no projects. 2007-12-20 19:52:15 +00:00
james
1d6c0c9530 Remove committee auth check and replace with commandline only check -- This allows the judges scheduler to actually run again! 2007-12-17 21:37:22 +00:00
dave
c9fb9f1084 - Fix bug 0000128, the order of the languages in the judging team names 2007-12-13 19:21:41 +00:00
dave
30d944f968 - Fix a typo 2007-11-21 22:31:34 +00:00
dave
0ff8489d58 - include user.inc.php before using user_auth_required() 2007-11-21 17:02:09 +00:00
dave
04e70ceb33 - Use user_auth_required() for authentication to check for committee access
(needed for multirole users)
- Add the top navbar to all pages
2007-11-18 23:50:23 +00:00
james
f3ad2c7f26 Oops need to global $config for that last patch to work 2007-04-03 20:17:32 +00:00
james
31aebc743f Only count a huge penalty for the team if there's no chair on the team if the minimum number of judges per team is greater than 1. If the minimum is 1, then essentially the "willing chair" stuff should get ignored. 2007-04-03 20:16:48 +00:00
dave
1bdba54ed5 - Add a special awards feature (off by default) to the judge scheduler. It:
- Creates a judging team for each special award
	- Assigns judges to special awards based on the number of students self
	  nominated.
	- Obeys the judges special award preferences (if enabled), and also
	  judges that specify if they are a judge for a specific special award
	  (if enabled).

- Add 2 new config variables.
	- Enable the special award scheduler
	- Specify the max. number of projects each special award judge can
	  handle (default: 20)

- Delete an extra blank line in register_participants_students.php
2007-03-28 06:16:41 +00:00
james
b65316c32e Changes to judging scheduler so the process runs smoothly
Dont let it start running if its already going
Properly handle the text when its done running
2006-10-25 03:19:54 +00:00
james
5cf008adf6 s/precent/percent 2006-10-25 02:26:49 +00:00
dave
b883d2f389 - Fix the percent update in the judge scheduler 2006-10-25 02:23:53 +00:00
james
cf1bf2cf9d change set_progress to set_percent 2006-10-25 01:48:32 +00:00
dave
ea418624ba - Add status output to the judge scheduler in the form of 2 variables.
Completely untested because I don't have judge data here.  Will test when I
  get home and debug.
2006-10-25 00:53:02 +00:00
justin
a169e422e6 Add support to choose what status a project must have to be used by the judge scheduler. Allows for any of open, payment pending or complete projects to be allowed. 2006-08-12 18:05:38 +00:00
dave
c247119663 Remove redundant config code. Use the judge scheduler options directly. 2006-08-11 21:10:33 +00:00
dave
6d6dd8abb1 We must have a number of judging teams at least equal to the number
of times a project must be judged, to avoid assigning the same jteam to
the same project
2006-08-11 01:11:14 +00:00
dave
58e1b4a05e Really fix the problem this time... Stupid Typo 2006-08-09 02:06:36 +00:00
dave
e1c39dd0a3 This shoul dfix the case where there are no projects in a judging division 2006-08-09 02:01:43 +00:00
dave
be711441ea Recommend 15 minutes, not 10 for the php script run time. The annealer takes 12 minutes on my system with really high effort. 2006-08-08 07:03:03 +00:00
dave
dcefe6cdad Replaced the timeslot scheduler. This one is much faster, but it doens't actually compute cost for the number of judges the student has in a row. But, because it's totally random in layout multiple judges in a row should happen very infrequently. 2006-08-08 06:51:07 +00:00
dave
03acd9d8fc Use the annealer to assign projects and judges to timeslots. This should
prevent a project from getting too many judges in a row, and also a judge from
judging 2 projects at the same time (which would be more of a problem).

Still need to write a verifier to check all the results.  But the annealer
tests look pretty good.  Unfortunately it takes a pretty long time to run. :(
2006-08-08 03:21:08 +00:00
dave
b86bb3bc9a - Fix most issues with projects being judged multiple times. This should fix
all issues EXCEPT that the timetable scheduler may assign two judging teams
  to the same project at the same time.  I will fix that soon.  But everything
  else should now work.
2006-08-02 08:07:51 +00:00
dave
c79f16837b - Remove a debugging line. 2006-08-02 07:44:31 +00:00
dave
5438821b1c - Don't include judges that area already on a judging team (their ID appears in
judges_teams_link) in the pool of judges for the judges scheduler.
2006-08-02 07:43:02 +00:00
dave
d01a3eede6 - Delete the old divisional teams, links, award links, timeslot links earlier
in the scheduler so we can only select judges that are NOT already part of a
  judging team

- Fix a numbering issue where sometimes an divisional team created by the
  scheduler wouldn't get created because of conflicting team numbers.  Now, use
  MAX(num) to find the highest team number and increment team numbers from that
  number.
2006-08-02 07:36:21 +00:00
dave
e7d726355d The new judge scheduler.
- Missing: Having a project judged more than once by different judging teams is
  untested, I don't htink it'll work properly, still working on that part.
- Missing: Auto updating the configuration if any of the variables are missing.
- Missing: A way to preserve judging questions (like willing_chair), so the
  user doesn't delete them and break the scheduler, OR, notice saying that the
  question has been deleted and the scheduler won't use the chair calculations,
  then we need a way to add them back in with the click of a button.
2006-08-01 19:43:15 +00:00