version 1.19, 2001/01/29 23:25:22
|
version 1.24, 2004/06/01 19:57:18
|
Line 2499 char *buf;double *num; char *num_p; char
|
Line 2499 char *buf;double *num; char *num_p; char
|
while( isspace(buf[idx]) ) { idx++; } |
while( isspace(buf[idx]) ) { idx++; } |
sscanf(num_str, "%lg", &result); /* put the numerical value into a double variable */ |
sscanf(num_str, "%lg", &result); /* put the numerical value into a double variable */ |
errcode = errcode | 1; |
errcode = errcode | 1; |
} else if( buf[idx] == 'x' || buf[idx] == 'X') { /* optional x or X part */ |
} else if( buf[idx] == 'x' || buf[idx] == 'X' || buf[idx] == '*') { /* optional x or X part */ |
idx++; /* skip x or X */ |
idx++; /* skip x or X */ |
while( isspace(buf[idx]) ) { idx++; } |
while( isspace(buf[idx]) ) { idx++; } |
|
|
Line 2638 answers_string(mode, p)int mode;Problem_
|
Line 2638 answers_string(mode, p)int mode;Problem_
|
if(len_dd == 0 ) { /* no unit_str */ |
if(len_dd == 0 ) { /* no unit_str */ |
sprintf(ans_str," %s [%s,%s]\n\n", str_aa,str_bb,str_cc); |
sprintf(ans_str," %s [%s,%s]\n\n", str_aa,str_bb,str_cc); |
} else { |
} else { |
sprintf(ans_str," %s [%s,%s] $%s$\n\n", str_aa,str_bb,str_cc,p->unit_str); |
sprintf(ans_str," %s [%s,%s] $\\mathrm{%s}$\n\n", str_aa,str_bb,str_cc,p->unit_str); |
} |
} |
capa_mfree((char *)str_aa); |
capa_mfree((char *)str_aa); |
capa_mfree((char *)str_bb); |
capa_mfree((char *)str_bb); |
Line 2660 answers_string(mode, p)int mode;Problem_
|
Line 2660 answers_string(mode, p)int mode;Problem_
|
if(len_dd == 0 ) { /* no unit_str */ |
if(len_dd == 0 ) { /* no unit_str */ |
sprintf(ans_str," %s\n", str_bb); |
sprintf(ans_str," %s\n", str_bb); |
} else { |
} else { |
sprintf(ans_str," %s $%s$\n", str_bb,p->unit_str); |
sprintf(ans_str," %s $\\mathrm{%s}$\n", str_bb,p->unit_str); |
} |
} |
capa_mfree((char *)str_bb); |
capa_mfree((char *)str_bb); |
} |
} |
Line 2897 answers_string(mode, p)int mode;Problem_
|
Line 2897 answers_string(mode, p)int mode;Problem_
|
} |
} |
|
|
|
|
|
int check_for_unit_fail(int result) |
|
{ |
|
int ret; |
|
ret = (result == UNIT_FAIL || |
|
result == UNIT_IRRECONCIBLE || |
|
result == UNIT_INVALID_STUDENT3 || |
|
result == UNIT_INVALID_STUDENT2 || |
|
result == UNIT_INVALID_STUDENT1); |
|
return ret; |
|
} |
|
|
/* ------------------------------ called from capalogin */ |
/* ------------------------------ called from capalogin */ |
/* impose stronger checking on the user input string *answer */ |
/* impose stronger checking on the user input string *answer */ |
Line 2921 capa_check_ans(ai,ans, error) AnswerInfo
|
Line 2931 capa_check_ans(ai,ans, error) AnswerInfo
|
int sig, corr_len; |
int sig, corr_len; |
int choice[ANSWER_STRING_LENG]; |
int choice[ANSWER_STRING_LENG]; |
char num_str[ANSWER_STRING_LENG], unit_str[ANSWER_STRING_LENG]; |
char num_str[ANSWER_STRING_LENG], unit_str[ANSWER_STRING_LENG]; |
char fmted[ANSWER_STRING_LENG], correct[ANSWER_STRING_LENG], answer[ANSWER_STRING_LENG]; |
char fmted[ANSWER_STRING_LENG], correctans[ANSWER_STRING_LENG], answer[ANSWER_STRING_LENG]; |
double n_part; |
double n_part; |
double given, target, ratio, fmted_target, target_u, target_l, scale=1.0; |
double given, target, ratio, fmted_target, target_u, target_l, scale=1.0; |
double delta; |
double delta; |
Line 2947 capa_check_ans(ai,ans, error) AnswerInfo
|
Line 2957 capa_check_ans(ai,ans, error) AnswerInfo
|
outcome = split_num_unit(ans,&n_part,num_str,unit_str); |
outcome = split_num_unit(ans,&n_part,num_str,unit_str); |
if( outcome > 1 ) { /* with both num and unit parts or only unit part */ |
if( outcome > 1 ) { /* with both num and unit parts or only unit part */ |
if( u_p != NULL ) { |
if( u_p != NULL ) { |
if (UNIT_FAIL == (result = check_correct_unit(unit_str,u_p,&scale))) { |
result = check_correct_unit(unit_str,u_p,&scale); |
|
if (check_for_unit_fail(result)) { |
*error=strsave(unit_str); |
*error=strsave(unit_str); |
} |
} |
} else { /* what to do when no unit is specified but student entered a unit? */ |
} else { /* what to do when no unit is specified but student entered a unit? */ |
Line 2959 capa_check_ans(ai,ans, error) AnswerInfo
|
Line 2970 capa_check_ans(ai,ans, error) AnswerInfo
|
result = NO_UNIT; |
result = NO_UNIT; |
} |
} |
} |
} |
if( (result != NO_UNIT) && (result != UNIT_FAIL) && ( result != UNIT_NOTNEEDED) ) { |
if( (result != NO_UNIT) && (!check_for_unit_fail(result)) && ( result != UNIT_NOTNEEDED) ) { |
if( t == ANSWER_IS_FLOAT ) { |
if( t == ANSWER_IS_FLOAT ) { |
target = (double)atof(s); /* real number */ |
target = (double)atof(s); /* real number */ |
} else { |
} else { |
Line 3020 capa_check_ans(ai,ans, error) AnswerInfo
|
Line 3031 capa_check_ans(ai,ans, error) AnswerInfo
|
{ |
{ |
corr_len = strlen(s); input_len = strlen(ans); |
corr_len = strlen(s); input_len = strlen(ans); |
if( corr_len == input_len ) { |
if( corr_len == input_len ) { |
for(idx=0;idx<ANSWER_STRING_LENG;idx++) choice[idx] = 0; |
for(idx=0;idx<ANSWER_STRING_LENG;idx++) { |
|
choice[idx] = 0;correctans[idx] = 0; |
|
} |
result = EXACT_ANS; |
result = EXACT_ANS; |
for(ii=0;ii<corr_len; ii++) { |
for(ii=0;ii<corr_len; ii++) { |
idx = toupper(s[ii]) - 'A'; choice[idx] = 1; |
idx = toupper(s[ii]) - 'A'; choice[idx] = 1; |
} |
} |
for(ii=0;ii<input_len;ii++) { |
for(ii=0;ii<input_len;ii++) { |
idx = toupper(ans[ii]) - 'A'; |
idx = toupper(ans[ii]) - 'A'; correctans[idx] = 1; |
if(choice[idx] != 1 ) result = INCORRECT; |
} |
|
for(ii=0;ii<ANSWER_STRING_LENG;ii++) { |
|
if(choice[ii] != correctans[ii] ) result = INCORRECT; |
} |
} |
} else { result = INCORRECT; } |
} else { result = INCORRECT; } |
break; |
break; |
Line 3077 capa_check_answer(p, answer, error) Prob
|
Line 3092 capa_check_answer(p, answer, error) Prob
|
int sig_l; |
int sig_l; |
int sig_u; |
int sig_u; |
char *fmt; |
char *fmt; |
int choice[ANSWER_STRING_LENG], ii, idx, corr_len, input_len; |
int choice[ANSWER_STRING_LENG], correctans[ANSWER_STRING_LENG]; |
|
int ii, idx, corr_len, input_len; |
int result = INCORRECT, sig, outcome, all_alphabet; |
int result = INCORRECT, sig, outcome, all_alphabet; |
char fmted[FORMAT_STRING_LENG]; |
char fmted[FORMAT_STRING_LENG]; |
double given, target, ratio, fmted_target, target_u, target_l, scale=1.0; |
double given, target, ratio, fmted_target, target_u, target_l, scale=1.0; |
Line 3092 capa_check_answer(p, answer, error) Prob
|
Line 3108 capa_check_answer(p, answer, error) Prob
|
fmt = p->ans_fmt; |
fmt = p->ans_fmt; |
calc_type = p->calc; |
calc_type = p->calc; |
unit_str[0]=0; |
unit_str[0]=0; |
|
|
switch(type) { |
switch(type) { |
case ANSWER_IS_INTEGER: |
case ANSWER_IS_INTEGER: |
case ANSWER_IS_FLOAT: |
case ANSWER_IS_FLOAT: |
Line 3108 capa_check_answer(p, answer, error) Prob
|
Line 3124 capa_check_answer(p, answer, error) Prob
|
outcome = split_num_unit(answer,&n_part,input,unit_str); |
outcome = split_num_unit(answer,&n_part,input,unit_str); |
if( outcome > 1 ) { /* with both num and unit parts or only unit part */ |
if( outcome > 1 ) { /* with both num and unit parts or only unit part */ |
if( p->ans_unit != NULL ) { |
if( p->ans_unit != NULL ) { |
if ( UNIT_FAIL == ( result = check_correct_unit(unit_str,p->ans_unit,&scale) ) ) { |
result = check_correct_unit(unit_str,p->ans_unit,&scale); |
|
if (check_for_unit_fail(result)) { |
*error=strsave(unit_str); |
*error=strsave(unit_str); |
} |
} |
} else { /* what to do when no unit is specified but student entered a unit? */ |
} else { /* what to do when no unit is specified but student entered a unit? */ |
Line 3120 capa_check_answer(p, answer, error) Prob
|
Line 3137 capa_check_answer(p, answer, error) Prob
|
result = NO_UNIT; |
result = NO_UNIT; |
} |
} |
} |
} |
if( (result != NO_UNIT) && (result != UNIT_FAIL) && ( result != UNIT_NOTNEEDED) ) { |
if( (result != NO_UNIT) && (!check_for_unit_fail(result)) && ( result != UNIT_NOTNEEDED) ) { |
if( type == ANSWER_IS_FLOAT ) { |
if( type == ANSWER_IS_FLOAT ) { |
target = (double)atof(correct); /* real number */ |
target = (double)atof(correct); /* real number */ |
} else { |
} else { |
Line 3181 capa_check_answer(p, answer, error) Prob
|
Line 3198 capa_check_answer(p, answer, error) Prob
|
{ |
{ |
corr_len = strlen(correct); input_len = strlen(answer); |
corr_len = strlen(correct); input_len = strlen(answer); |
if( corr_len == input_len ) { |
if( corr_len == input_len ) { |
for(ii=0;ii<ANSWER_STRING_LENG;ii++) choice[ii] = 0; result = EXACT_ANS; |
for(idx=0;idx<ANSWER_STRING_LENG;idx++) { |
|
choice[idx] = 0;correctans[idx] = 0; |
|
} |
|
result = EXACT_ANS; |
for(ii=0;ii<corr_len; ii++) { |
for(ii=0;ii<corr_len; ii++) { |
idx = toupper(correct[ii]) - 'A'; choice[idx] = 1; |
idx = toupper(correct[ii]) - 'A'; choice[idx] = 1; |
} |
} |
for(ii=0;ii<input_len;ii++) { |
for(ii=0;ii<input_len;ii++) { |
idx = toupper(answer[ii]) - 'A'; |
idx = toupper(answer[ii]) - 'A'; correctans[idx] = 1; |
if(choice[idx] != 1 ) result = INCORRECT; |
} |
|
for(ii=0;ii<ANSWER_STRING_LENG;ii++) { |
|
if(choice[ii] != correctans[ii] ) result = INCORRECT; |
} |
} |
} else { result = INCORRECT; } |
} else { result = INCORRECT; } |
break; |
break; |
Line 3252 char *fml_str;char *input_str;char *var_
|
Line 3274 char *fml_str;char *input_str;char *var_
|
} |
} |
} else { |
} else { |
diff = abs(1.0 - formula_val) * 100.0 ; |
diff = abs(1.0 - formula_val) * 100.0 ; |
if( diff < tol ) { |
if( diff > tol ) { |
outcome = INCORRECT; |
outcome = INCORRECT; |
} |
} |
} |
} |
Line 3390 Problem_t *p; char **answers; int cnt; c
|
Line 3412 Problem_t *p; char **answers; int cnt; c
|
done = ii = 0; |
done = ii = 0; |
result = 0; |
result = 0; |
while( !done ) { /* check if any of the outcome has failed on units */ |
while( !done ) { /* check if any of the outcome has failed on units */ |
if( (outcomes[ii] == UNIT_FAIL) || |
if( (check_for_unit_fail(outcomes[ii])) || |
(outcomes[ii] == NO_UNIT) || |
(outcomes[ii] == NO_UNIT) || |
(outcomes[ii] == UNIT_NOTNEEDED) ) { |
(outcomes[ii] == UNIT_NOTNEEDED) ) { |
result = outcomes[ii]; |
result = outcomes[ii]; |
Line 3437 Problem_t *p; char **answers; int cnt; c
|
Line 3459 Problem_t *p; char **answers; int cnt; c
|
} |
} |
} |
} |
for (ii=0;ii<cnt;ii++) { |
for (ii=0;ii<cnt;ii++) { |
if( (outcomes[ii] == UNIT_FAIL) || |
if( (check_for_unit_fail(outcomes[ii])) || |
(outcomes[ii] == SIG_FAIL) || |
(outcomes[ii] == SIG_FAIL) || |
(outcomes[ii] == UNIT_NOTNEEDED) ) { |
(outcomes[ii] == UNIT_NOTNEEDED) ) { |
capa_mfree(errormsg[ii]); |
capa_mfree(errormsg[ii]); |
Line 3455 Problem_t *p; char **answers; int cnt; c
|
Line 3477 Problem_t *p; char **answers; int cnt; c
|
result = capa_check_answer(p, answers[0], error); |
result = capa_check_answer(p, answers[0], error); |
ii = 1; ai = p->ans_list; |
ii = 1; ai = p->ans_list; |
while( (ii<p->ans_cnt) && ( (result != EXACT_ANS) && (result != APPROX_ANS) ) ) { |
while( (ii<p->ans_cnt) && ( (result != EXACT_ANS) && (result != APPROX_ANS) ) ) { |
if((ii!=1)&&((result==UNIT_FAIL)||(result==SIG_FAIL)||(result==UNIT_NOTNEEDED))) { |
if((ii!=1)&&((check_for_unit_fail(result))||(result==SIG_FAIL)||(result==UNIT_NOTNEEDED))) { |
capa_mfree((char*)error); |
capa_mfree((char*)error); |
} |
} |
result = capa_check_ans(ai,answers[0],error); |
result = capa_check_ans(ai,answers[0],error); |