Menu
▾
▴
openwebwork-cvs
|
From: Arnie P. v. a. <we...@ma...> - 2009-10-17 16:05:16
|
Log Message:
-----------
Implement a Reduced Scoring Period. The Reduced Scoring Period is a period before the due date during which all additional work done by the student counts at a reduced rate.
Also clean up the LDAP section
Modified Files:
--------------
webwork2/conf:
global.conf.dist
Revision Data
-------------
Index: global.conf.dist
===================================================================
RCS file: /webwork/cvs/system/webwork2/conf/global.conf.dist,v
retrieving revision 1.217
retrieving revision 1.218
diff -Lconf/global.conf.dist -Lconf/global.conf.dist -u -r1.217 -r1.218
--- conf/global.conf.dist
+++ conf/global.conf.dist
@@ -608,14 +608,15 @@
};
$authen{ldap_options} = {
- # hosts to attempt to connect to, in order. for example:
+ # hosts to attempt to connect to, in order. For example:
# auth.myschool.edu -- uses LDAP scheme and port 389
# ldap://auth.myschool.edu:666 -- non-standard port
# ldaps://auth.myschool.edu -- uses LDAPS scheme and port 636
# ldaps://auth.myschool.edu:389 -- SSL on non-SSL port
+ # Edit the host(s) below:
net_ldap_hosts => [
- "ldaps://corona-dmc.its.rochester.edu",
- "ldaps://corona-dmb.acs.rochester.edu",
+ "ldaps://auth1.myschool.edu",
+ "ldaps://auth2.myschool.edu",
],
# connection options
net_ldap_options => {
@@ -623,7 +624,8 @@
version => 3,
},
# base to use when searching for user's DN
- net_ldap_base => "ou=people,dc=rochester,dc=edu",
+ # Edit the data below:
+ net_ldap_base => "ou=people,dc=myschool,dc=edu",
# Use a Bind account if set to 1
bindAccount => 0,
@@ -631,8 +633,6 @@
searchDN => "cn=search,DC=youredu,DC=edu",
bindPassword => "password",
-
-
# If LDAP rejects password, check it against the WeBWorK password database
failover => 1,
};
@@ -996,6 +996,8 @@
numZeroLevelTolDefault => 1E-12,
useBaseTenLog => 0,
defaultDisplayMatrixStyle => "[s]",
+ reducedScoringPeriod => 0, # Length of Reduced Scoring Period in minutes
+ reducedScoringValue...........=> 1, # A number in [0,1]. Students will be informed of the value as a percentage
};
################################################################################
|
|
From: Arnie P. v. a. <we...@ma...> - 2009-10-17 16:06:11
|
Log Message:
-----------
Implement a Reduced Scoring Period. The Reduced Scoring Period is a period before the due date during which all additional work done by the student counts at a reduced rate.
Modified Files:
--------------
webwork2/lib/WeBWorK:
Constants.pm
Revision Data
-------------
Index: Constants.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/Constants.pm,v
retrieving revision 1.59
retrieving revision 1.60
diff -Llib/WeBWorK/Constants.pm -Llib/WeBWorK/Constants.pm -u -r1.59 -r1.60
--- lib/WeBWorK/Constants.pm
+++ lib/WeBWorK/Constants.pm
@@ -2,12 +2,12 @@
# WeBWorK Online Homework Delivery System
# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
# $CVSHeader$
-#
+#
# This program is free software; you can redistribute it and/or modify it under
# the terms of either: (a) the GNU General Public License as published by the
# Free Software Foundation; either version 2, or (at your option) any later
# version, or (b) the "Artistic License" which comes with this package.
-#
+#
# This program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See either the GNU General Public License or the
@@ -30,27 +30,27 @@
################################################################################
# If true, WeBWorK::Debug will print debugging output.
-#
+#
$WeBWorK::Debug::Enabled = 0;
# If non-empty, debugging output will be sent to the file named rather than STDERR.
-#
+#
$WeBWorK::Debug::Logfile = "";
# If defined, prevent subroutines matching the following regular expression from
# logging.
-#
+#
# For example, this pattern prevents the dispatch() function from logging:
# $WeBWorK::Debug::DenySubroutineOutput = qr/^WeBWorK::dispatch$/;
-#
+#
$WeBWorK::Debug::DenySubroutineOutput = undef;
# If defined, allow only subroutines matching the following regular expression
# to log.
-#
+#
# For example, this pattern allow only some function being worked on to log:
# $WeBWorK::Debug::AllowSubroutineOutput = qr/^WeBWorK::SomePkg::myFunc$/;
-#
+#
$WeBWorK::Debug::AllowSubroutineOutput = undef;
################################################################################
@@ -58,7 +58,7 @@
################################################################################
# If true, don't delete temporary files
-#
+#
$WeBWorK::ContentGenerator::Hardcopy::PreserveTempFiles = 0;
################################################################################
@@ -74,28 +74,28 @@
################################################################################
# Arguments to pass to dvipng. This is dependant on the version of dvipng.
-#
+#
# For dvipng versions 0.x
# $WeBWorK::PG::ImageGenerator::DvipngArgs = "-x4000.5 -bgTransparent -Q6 -mode toshiba -D180";
# For dvipng versions 1.0 to 1.5
# $WeBWorK::PG::ImageGenerator::DvipngArgs = "-bgTransparent -D120 -q -depth";
-#
+#
# For dvipng versions 1.6 (and probably above)
# $WeBWorK::PG::ImageGenerator::DvipngArgs = "-bgtransparent -D120 -q -depth";
-# Note: In 1.6 and later, bgTransparent gives alpha-channel transparency while
+# Note: In 1.6 and later, bgTransparent gives alpha-channel transparency while
# bgtransparent gives single-bit transparency. If you use alpha-channel transparency,
-# the images will not be viewable with MSIE. bgtransparent works for version 1.5,
+# the images will not be viewable with MSIE. bgtransparent works for version 1.5,
# but does not give transparent backgrounds. It does not work for version 1.2. It has not
# been tested with other versions.
#
$WeBWorK::PG::ImageGenerator::DvipngArgs = "-bgtransparent -D120 -q -depth";
# If true, don't delete temporary files
-#
+#
$WeBWorK::PG::ImageGenerator::PreserveTempFiles = 0;
# TeX to prepend to equations to be processed.
-#
+#
$WeBWorK::PG::ImageGenerator::TexPreamble = <<'EOF';
\documentclass[12pt]{article}
\nonstopmode
@@ -107,7 +107,7 @@
EOF
# TeX to append to equations to be processed.
-#
+#
$WeBWorK::PG::ImageGenerator::TexPostamble = <<'EOF';
\end{document}
EOF
@@ -117,11 +117,11 @@
################################################################################
# Configuation data
-# It is organized by section. The allowable types are
+# It is organized by section. The allowable types are
# 'text' for a text string (no quote marks allowed),
# 'number' for a number,
# 'list' for a list of text strings,
-# 'permission' for a permission value,
+# 'permission' for a permission value,
# 'boolean' for variables which really hold 0/1 values as flags.
# 'checkboxlist' for variables which really hold a list of values which
# can be independently picked yes/no as checkboxes
@@ -134,7 +134,7 @@
type => 'text'},
{ var => 'defaultTheme',
doc => 'Theme (refresh page after saving changes to reveal new theme)',
- doc2 => 'There are currently four themes (or skins) to choose from: ur, math, math2 and moodle. The theme
+ doc2 => 'There are currently four themes (or skins) to choose from: ur, math, math2 and moodle. The theme
specifies a unified look and feel for the WeBWorK course web pages.',
values => [qw(math math2 ur moodle union)],
type => 'popuplist'},
@@ -220,28 +220,28 @@
min => 1,
values => ["plainText", "formattedText", "images", "jsMath", "asciimath", "LaTeXMathML"],
type => 'checkboxlist'},
-
+
{ var => 'pg{options}{displayMode} ',
doc => 'The default display mode',
doc2 => 'Enter one of the allowed display mode types above. See \'display modes entry\' for descriptions.',
min => 1,
type => 'text'},
-
+
{ var => 'pg{ansEvalDefaults}{useBaseTenLog}',
doc => 'Use log base 10 instead of base <i>e</i>',
doc2 => 'Set to true for log to mean base 10 log and false for log to mean natural logarithm',
type => 'boolean'},
-
+
{ var => 'pg{ansEvalDefaults}{useOldAnswerMacros}',
doc => 'Use older answer checkers',
doc2 => 'During summer 2005, a newer version of the answer checkers was implemented for answers which are functions and numbers. The newer checkers allow more functions in student answers, and behave better in certain cases. Some problems are specifically coded to use new (or old) answer checkers. However, for the bulk of the problems, you can choose what the default will be here. <p>Choosing <i>false</i> here means that the newer answer checkers will be used by default, and choosing <i>true</i> means that the old answer checkers will be used by default.',
type => 'boolean'},
-
+
{ var => 'pg{ansEvalDefaults}{defaultDisplayMatrixStyle}',
doc => 'Control string for displaying matricies',
doc2 => 'String of three characters for defining the defaults for displaying matricies. The first and last characters give the left and right delimiters of the matrix, so usually one of ([| for a left delimiter, and one of )]| for the right delimiter. It is also legal to specify "." for no delimiter. <p> The middle character indicates how to display vertical lines in a matrix (e.g., for an augmented matrix). This can be s for solid lines and d for dashed lines. While you can specify the defaults, individual problems may override these values.',
type => 'text'},
-
+
{ var => 'pg{ansEvalDefaults}{numRelPercentTolDefault}',
doc => 'Allowed error, as a percentage, for numerical comparisons',
doc2 => "When numerical answers are checked, most test if the student's answer
@@ -251,18 +251,42 @@
<p>
A value such as 0.1 means 0.1 percent error is allowed.",
type => 'number'},
+ { var => 'pg{ansEvalDefaults}{reducedScoringPeriod}',
+ doc => 'Length of Reduced Scoring Period in minutes',
+ doc2 => 'The Reduced Scoring Period is a period before the due date during which
+ all additional work done by the student counts at a reduced rate. Here is where
+ you set the length of this period in minutes. If this value is greater than 0, a
+ message like "This assignment has a Reduced Scoring Period that begins 11/08/2009
+ at 06:17pm EST and ends on the due date, 11/10/2009 at 06:17pm EST. During this
+ period all additional work done counts 50% of the original." will be displayed.<p>
+ This works with the avg_problem_grader (which is the the default grader) and the
+ std_problem_grader (the all or nothing grader). It will work with custom graders
+ if they are written appropriately.' ,
+ type => 'number'},
+ { var => 'pg{ansEvalDefaults}{reducedScoringValue}',
+ doc => 'Value of work done in Reduced Scoring Period' ,
+ doc2 => 'The Reduced Scoring Period is a period before the due date during which
+ all additional work done by the student counts at a reduced rate. Here is where
+ you set the reduced rate which must be a number in the interval [0,1]. 1 means no
+ reduction. For example if this value is .5 and a student views a problem during the
+ Reduced Scoring Period, they will see the message "You are in the Reduced Scoring
+ Period: All additional work done counts 50% of the original." <p>
+ This works with the avg_problem_grader (which is the the default grader) and the
+ std_problem_grader (the all or nothing grader). It will work with custom graders
+ if they are written appropriately.' ,
+ type => 'number'},
],
['E-Mail',
{ var => 'mail{feedbackSubjectFormat}',
doc => 'Format for the subject line in feedback e-mails',
- doc2 => 'When students click the <em>Email Instructor</em> button
- to send feedback, WeBWorK fills in the subject line. Here you can set the
- subject line. In it, you can have various bits of information filled in
+ doc2 => 'When students click the <em>Email Instructor</em> button
+ to send feedback, WeBWorK fills in the subject line. Here you can set the
+ subject line. In it, you can have various bits of information filled in
with the following escape sequences.
<p>
<ul>
<li> %c = course ID
-<li> %u = user ID
+<li> %u = user ID
<li> %s = set ID
<li> %p = problem ID
<li> %x = section
@@ -290,7 +314,7 @@
doc => 'E-mail feedback from students automatically sent to this permission level and higher:',
doc2 => 'Users with this permssion level or greater will automatically be sent feedback from students (generated when they use the "Contact instructor" button on any problem page). In addition the feedback message will be sent to addresses listed below. To send ONLY to addresses listed below set permission level to "nobody".',
type => 'permission'},
-
+
{ var => 'mail{feedbackRecipients}',
doc => 'Additional addresses for receiving feedback e-mail.',
doc2 => 'By default, feeback is sent to all users above who have permission to receive feedback. Feedback is also sent to any addresses specified in this blank. Separate email address entries by commas.',
|
|
From: Arnie P. v. a. <we...@ma...> - 2009-10-17 16:06:36
|
Log Message:
-----------
Implement a Reduced Scoring Period. The Reduced Scoring Period is a period before the due date during which all additional work done by the student counts at a reduced rate.
Modified Files:
--------------
webwork2/lib/WeBWorK/ContentGenerator:
Problem.pm
Revision Data
-------------
Index: Problem.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm,v
retrieving revision 1.218
retrieving revision 1.219
diff -Llib/WeBWorK/ContentGenerator/Problem.pm -Llib/WeBWorK/ContentGenerator/Problem.pm -u -r1.218 -r1.219
--- lib/WeBWorK/ContentGenerator/Problem.pm
+++ lib/WeBWorK/ContentGenerator/Problem.pm
@@ -875,10 +875,12 @@
# store state in DB if it makes sense
if ($will{recordAnswers}) {
$problem->status($pg->{state}->{recorded_score});
+ $problem->sub_status($pg->{state}->{sub_recorded_score});
$problem->attempted(1);
$problem->num_correct($pg->{state}->{num_of_correct_ans});
$problem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
$pureProblem->status($pg->{state}->{recorded_score});
+ $pureProblem->sub_status($pg->{state}->{sub_recorded_score});
$pureProblem->attempted(1);
$pureProblem->num_correct($pg->{state}->{num_of_correct_ans});
$pureProblem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
|
|
From: Arnie P. v. a. <we...@ma...> - 2009-10-17 16:06:56
|
Log Message:
-----------
Implement a Reduced Scoring Period. The Reduced Scoring Period is a period before the due date during which all additional work done by the student counts at a reduced rate.
Modified Files:
--------------
webwork2/lib/WeBWorK/ContentGenerator:
ProblemSet.pm
Revision Data
-------------
Index: ProblemSet.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm,v
retrieving revision 1.92
retrieving revision 1.93
diff -Llib/WeBWorK/ContentGenerator/ProblemSet.pm -Llib/WeBWorK/ContentGenerator/ProblemSet.pm -u -r1.92 -r1.93
--- lib/WeBWorK/ContentGenerator/ProblemSet.pm
+++ lib/WeBWorK/ContentGenerator/ProblemSet.pm
@@ -308,6 +308,19 @@
my $hardcopyURL = $self->systemLink($hardcopyPage);
print CGI::p(CGI::a({href=>$hardcopyURL}, "Download a hardcopy of this homework set."));
+
+
+ my $reducedScoringPeriod = $ce->{pg}->{ansEvalDefaults}->{reducedScoringPeriod};
+ if ($reducedScoringPeriod > 0) {
+ my $dueDate = $self->formatDateTime($set->due_date());
+ my $reducedScoringPeriodSec = $reducedScoringPeriod*60; # $reducedScoringPeriod is in minutes
+ my $reducedScoringValue = $ce->{pg}->{ansEvalDefaults}->{reducedScoringValue};
+ my $reducedScoringPerCent = int(100*$reducedScoringValue+.5);
+ my $beginReducedScoringPeriod = $self->formatDateTime($set->due_date() - $reducedScoringPeriodSec);
+ print CGI::div({class=>"ResultsAlert"},"This assignment has a Reduced Scoring Period that begins
+ $beginReducedScoringPeriod and ends on the due date, $dueDate. During this period all additional
+ work done counts $reducedScoringPerCent\% of the original.");
+ }
# DBFIXME use iterator
my @problemNumbers = $db->listUserProblems($effectiveUser, $setName);
|
|
From: Arnie P. v. a. <we...@ma...> - 2009-10-17 16:07:38
|
Log Message:
-----------
Implement a Reduced Scoring Period. The Reduced Scoring Period is a period before the due date during which all additional work done by the student counts at a reduced rate.
Modified Files:
--------------
webwork2/lib/WeBWorK/PG:
Local.pm
Revision Data
-------------
Index: Local.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/PG/Local.pm,v
retrieving revision 1.27
retrieving revision 1.28
diff -Llib/WeBWorK/PG/Local.pm -Llib/WeBWorK/PG/Local.pm -u -r1.27 -r1.28
--- lib/WeBWorK/PG/Local.pm
+++ lib/WeBWorK/PG/Local.pm
@@ -358,6 +358,7 @@
#warn "PG: retrieving the problem state and giving it to the translator\n";
$translator->rh_problem_state({
recorded_score => $problem->status,
+ sub_recorded_score => $problem->sub_status,
num_of_correct_ans => $problem->num_correct,
num_of_incorrect_ans => $problem->num_incorrect,
});
@@ -390,7 +391,7 @@
($result, $state) = $translator->grade_problem(
answers_submitted => $translationOptions->{processAnswers},
ANSWER_ENTRY_ORDER => \@answerOrder,
- %{$formFields}, #FIXME? this is used by sequentialGrader is there a better way?
+ %{$formFields}, #FIXME? this is used by sequentialGrader is there a better way
);
}
|
|
From: Arnie P. v. a. <we...@ma...> - 2009-10-17 16:08:53
|
Log Message:
-----------
Implement a Reduced Scoring Period. The Reduced Scoring Period is a period before the due date during which all additional work done by the student counts at a reduced rate.
Modified Files:
--------------
webwork2/lib/WeBWorK/Utils:
Tasks.pm
Revision Data
-------------
Index: Tasks.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/Utils/Tasks.pm,v
retrieving revision 1.17
retrieving revision 1.18
diff -Llib/WeBWorK/Utils/Tasks.pm -Llib/WeBWorK/Utils/Tasks.pm -u -r1.17 -r1.18
--- lib/WeBWorK/Utils/Tasks.pm
+++ lib/WeBWorK/Utils/Tasks.pm
@@ -134,7 +134,8 @@
$problem->problem_seed($options{'problem_seed'})
if(defined($options{'problem_seed'}));
- $problem->status(0);
+ $problem->status(0);
+ $problem->sub_status(0);
$problem->attempted(0);
$problem->last_answer("");
$problem->num_correct(0);
|
|
From: Arnie P. v. a. <we...@ma...> - 2009-10-17 16:09:05
|
Log Message:
-----------
Implement a Reduced Scoring Period. The Reduced Scoring Period is a period before the due date during which all additional work done by the student counts at a reduced rate.
Modified Files:
--------------
webwork2/lib/WeBWorK/PG:
Remote.pm
Revision Data
-------------
Index: Remote.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/PG/Remote.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -Llib/WeBWorK/PG/Remote.pm -Llib/WeBWorK/PG/Remote.pm -u -r1.6 -r1.7
--- lib/WeBWorK/PG/Remote.pm
+++ lib/WeBWorK/PG/Remote.pm
@@ -100,6 +100,7 @@
envir => $envir,
problem_state => {
recorded_score => $problem->status,
+ sub_recorded_score => $problem->sub_status,
num_of_correct_ans => $problem->num_correct,
num_of_incorrect_ans => $problem->num_incorrect,
},
|
|
From: Arnie P. v. a. <we...@ma...> - 2009-10-17 16:09:35
|
Log Message:
-----------
Implement a Reduced Scoring Period. The Reduced Scoring Period is a period before the due date during which all additional work done by the student counts at a reduced rate.
Modified Files:
--------------
webwork2/lib/WeBWorK/DB:
Utils.pm
Revision Data
-------------
Index: Utils.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/DB/Utils.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -Llib/WeBWorK/DB/Utils.pm -Llib/WeBWorK/DB/Utils.pm -u -r1.24 -r1.25
--- lib/WeBWorK/DB/Utils.pm
+++ lib/WeBWorK/DB/Utils.pm
@@ -67,6 +67,7 @@
$userProblem->num_correct(0);
$userProblem->num_incorrect(0);
$userProblem->problem_seed($seed);
+ $userProblem->sub_status(0.0);
return $userProblem;
}
|
|
From: Arnie P. v. a. <we...@ma...> - 2009-10-17 16:10:21
|
Log Message:
-----------
Implement a Reduced Scoring Period. The Reduced Scoring Period is a period before the due date during which all additional work done by the student counts at a reduced rate.
Modified Files:
--------------
webwork2/lib/WeBWorK/DB/Record:
UserProblem.pm
Revision Data
-------------
Index: UserProblem.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/DB/Record/UserProblem.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -Llib/WeBWorK/DB/Record/UserProblem.pm -Llib/WeBWorK/DB/Record/UserProblem.pm -u -r1.11 -r1.12
--- lib/WeBWorK/DB/Record/UserProblem.pm
+++ lib/WeBWorK/DB/Record/UserProblem.pm
@@ -42,6 +42,7 @@
last_answer => { type=>"TEXT" },
num_correct => { type=>"INT" },
num_incorrect => { type=>"INT" },
+ sub_status => { type=>"FLOAT" }, # A subsidiary status used to implement the reduced scoring period
);
}
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X