Menu
▾
▴
stack-cvs — CVS-commit messages
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(486) |
Jul
(201) |
Aug
(194) |
Sep
(87) |
Oct
(72) |
Nov
(72) |
Dec
(4) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(6) |
Feb
(41) |
Mar
(22) |
Apr
(4) |
May
(12) |
Jun
|
Jul
|
Aug
(42) |
Sep
(21) |
Oct
(14) |
Nov
(10) |
Dec
|
| 2007 |
Jan
(14) |
Feb
(34) |
Mar
(61) |
Apr
(54) |
May
(140) |
Jun
(184) |
Jul
(164) |
Aug
(130) |
Sep
(241) |
Oct
(175) |
Nov
(148) |
Dec
(96) |
| 2008 |
Jan
(5) |
Feb
(38) |
Mar
(30) |
Apr
(46) |
May
(25) |
Jun
(22) |
Jul
(5) |
Aug
(17) |
Sep
(2) |
Oct
(100) |
Nov
(83) |
Dec
(33) |
| 2009 |
Jan
(127) |
Feb
(43) |
Mar
(86) |
Apr
(34) |
May
(50) |
Jun
(168) |
Jul
(48) |
Aug
(66) |
Sep
(38) |
Oct
(75) |
Nov
(113) |
Dec
(72) |
| 2010 |
Jan
(123) |
Feb
(68) |
Mar
(26) |
Apr
(11) |
May
(39) |
Jun
(131) |
Jul
(56) |
Aug
(79) |
Sep
(69) |
Oct
(17) |
Nov
(166) |
Dec
(32) |
| 2011 |
Jan
(21) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
(1) |
Nov
(8) |
Dec
|
| 2012 |
Jan
(2) |
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Chris S. <san...@us...> - 2006-02-06 14:54:28
|
Update of /cvsroot/stack/stack-1-0/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15767/scripts Modified Files: stackQuestion.php Log Message: Index: stackQuestion.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/scripts/stackQuestion.php,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** stackQuestion.php 6 Feb 2006 14:44:01 -0000 1.60 --- stackQuestion.php 6 Feb 2006 14:54:20 -0000 1.61 *************** *** 1395,1402 **** $errs = validate_casstring($atest_ops); ! $ta = "[$ta,$atest_ops,FALSE]"; if ( 'SA_factored' == $atest or 'SA_partfrac' == $atest) { ! $ta = "[$sa,$atest_ops,TRUE]"; } --- 1395,1402 ---- $errs = validate_casstring($atest_ops); ! $ta = "[$ta,$atest_ops,false]"; if ( 'SA_factored' == $atest or 'SA_partfrac' == $atest) { ! $ta = "[$sa,$atest_ops,\]"; } |
|
From: Chris S. <san...@us...> - 2006-02-06 14:44:09
|
Update of /cvsroot/stack/stack-1-0/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12003/scripts Modified Files: stackQuestion.php Log Message: Index: stackQuestion.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/scripts/stackQuestion.php,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** stackQuestion.php 6 Feb 2006 14:42:09 -0000 1.59 --- stackQuestion.php 6 Feb 2006 14:44:01 -0000 1.60 *************** *** 78,82 **** $stackOptions['Floats']['type'] = 'list'; $stackOptions['Floats']['values'] = array('true','false'); ! $stackOptions['Floats']['default'] = 'TRUE'; $stackOptions['Floats']['CAS_KEY'] = 'OPT_NoFloats'; $stackOptions['Floats']['CAS_TYPE'] = 'ex'; --- 78,82 ---- $stackOptions['Floats']['type'] = 'list'; $stackOptions['Floats']['values'] = array('true','false'); ! $stackOptions['Floats']['default'] = 'true'; $stackOptions['Floats']['CAS_KEY'] = 'OPT_NoFloats'; $stackOptions['Floats']['CAS_TYPE'] = 'ex'; |
|
From: Chris S. <san...@us...> - 2006-02-06 14:42:18
|
Update of /cvsroot/stack/stack-1-0/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11394/scripts Modified Files: stackQuestion.php Log Message: Index: stackQuestion.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/scripts/stackQuestion.php,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** stackQuestion.php 30 Jan 2006 09:25:42 -0000 1.58 --- stackQuestion.php 6 Feb 2006 14:42:09 -0000 1.59 *************** *** 77,81 **** // 'Floats'; $stackOptions['Floats']['type'] = 'list'; ! $stackOptions['Floats']['values'] = array('TRUE','FALSE'); $stackOptions['Floats']['default'] = 'TRUE'; $stackOptions['Floats']['CAS_KEY'] = 'OPT_NoFloats'; --- 77,81 ---- // 'Floats'; $stackOptions['Floats']['type'] = 'list'; ! $stackOptions['Floats']['values'] = array('true','false'); $stackOptions['Floats']['default'] = 'TRUE'; $stackOptions['Floats']['CAS_KEY'] = 'OPT_NoFloats'; |
|
From: Chris S. <san...@us...> - 2006-02-06 14:35:52
|
Update of /cvsroot/stack/stack-1-0/scripts/maxima In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8645/scripts/maxima Modified Files: stackmaxima.mac Log Message: Index: stackmaxima.mac =================================================================== RCS file: /cvsroot/stack/stack-1-0/scripts/maxima/stackmaxima.mac,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** stackmaxima.mac 6 Feb 2006 12:33:12 -0000 1.54 --- stackmaxima.mac 6 Feb 2006 14:35:41 -0000 1.55 *************** *** 238,242 **** print("], "), if ex=[] then return(StackValidOb("false","Simplify_Error",StackAddFeedback("",""))), ! ex=ex[1], if OPT_NoFloats and anyfloatex(ex) then return(StackValidOb("false","Illegal_floats",StackAddFeedback("","Illegal_floats"))), --- 238,242 ---- print("], "), if ex=[] then return(StackValidOb("false","Simplify_Error",StackAddFeedback("",""))), ! ex:ex[1], if OPT_NoFloats and anyfloatex(ex) then return(StackValidOb("false","Illegal_floats",StackAddFeedback("","Illegal_floats"))), |
|
From: Chris S. <san...@us...> - 2006-02-06 13:55:42
|
Update of /cvsroot/stack/stack-1-0 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22412 Modified Files: stackConfig.php.dist Log Message: Index: stackConfig.php.dist =================================================================== RCS file: /cvsroot/stack/stack-1-0/stackConfig.php.dist,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** stackConfig.php.dist 6 Feb 2006 12:33:12 -0000 1.8 --- stackConfig.php.dist 6 Feb 2006 13:55:32 -0000 1.9 *************** *** 83,87 **** // MAXIMA $stack_cas['cas'] = 'maxima'; ! $stack_cas['version'] = '5.9.1'; // MAXIMA --- 83,87 ---- // MAXIMA $stack_cas['cas'] = 'maxima'; ! $stack_cas['version'] = '5.9.2'; // MAXIMA |
|
From: Chris S. <san...@us...> - 2006-02-06 13:55:39
|
Update of /cvsroot/stack/stack-1-0/lang/en/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22412/lang/en/doc Modified Files: author_testsuite.php Log Message: Index: author_testsuite.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/lang/en/doc/author_testsuite.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** author_testsuite.php 27 Nov 2005 11:30:52 -0000 1.23 --- author_testsuite.php 6 Feb 2006 13:55:32 -0000 1.24 *************** *** 105,108 **** --- 105,109 ---- $testsuite[] = stack_testsuite_construct('CASEqual','1/0','x^2-2*x+1',0,'',''); + $testsuite[] = stack_testsuite_construct('CASEqual','a','A',0,'','Case sensitivity'); $testsuite[] = stack_testsuite_construct('CASEqual','4^(-1/2)','1/2',1,'','Numbers'); $testsuite[] = stack_testsuite_construct('CASEqual','0.5','1/2',0,'','Mix of floats and rational numbers'); |
|
From: Chris S. <san...@us...> - 2006-02-06 12:33:23
|
Update of /cvsroot/stack/stack-1-0/scripts/maxima In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15339/scripts/maxima Modified Files: initmaxima.php stackmaxima.mac Log Message: Changes from Maxima 5.9.1 to Maxima 5.9.2 Index: stackmaxima.mac =================================================================== RCS file: /cvsroot/stack/stack-1-0/scripts/maxima/stackmaxima.mac,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** stackmaxima.mac 30 Jan 2006 09:25:41 -0000 1.53 --- stackmaxima.mac 6 Feb 2006 12:33:12 -0000 1.54 *************** *** 4,25 **** /* save("initial-world.lisp",all); */ ! /* KILL(ALL); */ /* load("initial-world.lisp"); */ ! SIMPSUM:TRUE; ! DISPLAY2D:FALSE; ! NOLABELS:TRUE; ! INCHAR:"C_IN"; ! OUTCHAR:"C_OUT"; ! LOGABS:TRUE; ! EXPTDISPFLAG:TRUE; ! LINSOLVEWARN:FALSE; ! RATPRINT:FALSE; ! FPPRINTPREC:6; /* Print only 6 digits */ ! FPPREC:16; /* Work with 16 digits */ ! /* ASSUME_POS:TRUE; */ ! %E_TO_NUMLOG:TRUE; /* "r" some rational number, and "x" some expression, %E^(r*LOG(x)) => x^r .*/ --- 4,25 ---- /* save("initial-world.lisp",all); */ ! /* kill(all); */ /* load("initial-world.lisp"); */ ! simpsum:true; ! display2d:false; ! nolabels:true; ! inchar:"c_in"; ! outchar:"c_out"; ! logabs:true; ! exptdispflag:true; ! linsolvewarn:false; ! ratprint:false; ! fpprintprec:6; /* print only 6 digits */ ! fpprec:16; /* work with 16 digits */ ! /* ASSUME_POS:true; */ ! %E_TO_NUMLOG:true; /* "r" some rational number, and "x" some expression, %E^(r*LOG(x)) => x^r .*/ *************** *** 44,49 **** /* ********************************** */ ! round(x) := ?ROUND(x); ! truncate(x) := ?TRUNCATE(x); alias(int,integrate); /* Allows integrate to be called with int() */ alias(simplify,fullratsimp); /* Allows simplify to be something */ --- 44,49 ---- /* ********************************** */ ! round(x) := ?round(x); ! truncate(x) := ?truncate(x); alias(int,integrate); /* Allows integrate to be called with int() */ alias(simplify,fullratsimp); /* Allows simplify to be something */ *************** *** 160,167 **** /* LaTeX display */ if OPT_OUTPUT="LaTeX" then ! str:block([str:tex(expr,false)],concat(st,?subseq(str,2,ev(?length(str)-2,simp)),st)), /* Replace outer $$'s from Maxima's TEX command with \[ and \]*/ /* MathML display */ if OPT_OUTPUT="MathML" then ! str:mathml(expr,false), /* string display */ if OPT_OUTPUT="String" then str:string(expr), --- 160,173 ---- /* LaTeX display */ if OPT_OUTPUT="LaTeX" then ! str:block([expstr,offset], /* Remove $$'s from Maxima's TEX command */ ! expstr:tex(expr,false), ! offset:2, ! if MAXIMA_VERSION="5.9.1" then offset:2, ! if MAXIMA_VERSION="5.9.2" then offset:3, ! expstr:concat(st,?subseq(expstr,2,ev(?length(expstr)-offset,simp))) ! ), /* MathML display */ if OPT_OUTPUT="MathML" then ! str:mathml(expr,false), /* string display */ if OPT_OUTPUT="String" then str:string(expr), *************** *** 194,206 **** print("], key= ["), print(var), ! PRINT("]"), ! IF ex=[] THEN print(", value=[], display=[]") ! ELSE block(print(", value= ["), ! print(STRING(ex[1])), print("], display= ["), print(StackDISP(ex[1],"")), print("]") ), print("], "), ! return(TRUE) )$ --- 200,212 ---- print("], key= ["), print(var), ! print("]"), ! if ex=[] then print(", value=[], display=[]") ! else block(print(", value= ["), ! print(string(ex[1])), print("], display= ["), print(StackDISP(ex[1],"")), print("]") ), print("], "), ! return(true) )$ *************** *** 250,257 **** simp:true, ex:ev(ex,nouns,simp), ! ffmt:PLOT_TERMINAL, lvs:listofvars(ex), if length(lvs)#1 then ! (print(concat("Plot error: Can't create a plot with more than one variable, whereas you have: ",STRING(lvs))),return("<html><center>[Empty plot]</center></html>")), filename:concat("stackplot",string(rand(10^8))), tfn:concat(TMP_IMAGE_DIR,filename,".plt"), --- 256,263 ---- simp:true, ex:ev(ex,nouns,simp), ! ffmt:plot_terminal, lvs:listofvars(ex), if length(lvs)#1 then ! (print(concat("Plot error: Can't create a plot with more than one variable, whereas you have: ",string(lvs))),return("<html><center>[Empty plot]</center></html>")), filename:concat("stackplot",string(rand(10^8))), tfn:concat(TMP_IMAGE_DIR,filename,".plt"), *************** *** 263,270 **** set zeroaxis set grid ! set terminal ",PLOT_TERMINAL," ",PLOT_TERM_OPT," set output ",afn), ! set_plot_option([GNUPLOT_OUT_FILE,tfn]), ! set_plot_option([GNUPLOT_PREAMBLE, preamble]), if length(ra) = 1 then plot2d(ex,ra[1]), if length(ra) = 2 then plot2d(ex,ra[1],ra[2]), --- 269,276 ---- set zeroaxis set grid ! set terminal ",plot_terminal," ",plot_term_opt," set output ",afn), ! set_plot_option([gnuplot_out_file,tfn]), ! set_plot_option([gnuplot_preamble, preamble]), if length(ra) = 1 then plot2d(ex,ra[1]), if length(ra) = 2 then plot2d(ex,ra[1],ra[2]), *************** *** 288,301 **** lm: limit(ex,v,xp,PLUS), /* print(lp), print(lm), */ ! IF lp # UND ! AND lm # UND ! AND lp # IND ! AND lm # IND ! AND lp # INF ! AND lm # INF ! AND lp # MINF ! AND lm # MINF ! AND lp = lm ! THEN TRUE ELSE FALSE )$ --- 294,307 ---- lm: limit(ex,v,xp,PLUS), /* print(lp), print(lm), */ ! if lp # und ! and lm # und ! and lp # ind ! and lm # ind ! and lp # inf ! and lm # inf ! and lp # minf ! and lm # minf ! and lp = lm ! then true else false )$ *************** *** 311,315 **** xp:args[2], n:1, ! IF length(args)=3 THEN n:args[3], return(continuousp(diff(ex,v,n),v,xp)) )$ --- 317,321 ---- xp:args[2], n:1, ! if length(args)=3 then n:args[3], return(continuousp(diff(ex,v,n),v,xp)) )$ *************** *** 343,350 **** ret:( a:lp[1], if length(lp)>1 then ! ev(for i:2 thru length(lp) do (a:a AND lp[i]),simp), return(a) ) ) ! else ret:"FAIL", return(ret) )$ --- 349,356 ---- ret:( a:lp[1], if length(lp)>1 then ! ev(for i:2 thru length(lp) do (a:a and lp[i]),simp), return(a) ) ) ! else ret:"fail", return(ret) )$ *************** *** 355,376 **** ret:( a:lp[1], if length(lp)>1 then ! ev(for i:2 thru length(lp) do (a:a OR lp[i]),simp), return(a) ) ) ! else ret:"FAIL", return(ret) )$ /* Determines if we are using an equation */ equationp(ex) := block( ! if atom(ex) then return(FALSE), ! if "="= op(ex) then return(TRUE), ! return(FALSE) ); /* Determines if we are using an inequality */ inequalityp(ex) := block( ! if atom(ex) then return(FALSE), ! if ">"= op(ex) or "<"= op(ex) or ">="= op(ex) or "<="= op(ex)then return(TRUE), ! return(FALSE) ); --- 361,382 ---- ret:( a:lp[1], if length(lp)>1 then ! ev(for i:2 thru length(lp) do (a:a or lp[i]),simp), return(a) ) ) ! else ret:"fail", return(ret) )$ /* Determines if we are using an equation */ equationp(ex) := block( ! if atom(ex) then return(false), ! if "="= op(ex) then return(true), ! return(false) ); /* Determines if we are using an inequality */ inequalityp(ex) := block( ! if atom(ex) then return(false), ! if ">"= op(ex) or "<"= op(ex) or ">="= op(ex) or "<="= op(ex)then return(true), ! return(false) ); *************** *** 399,422 **** ev(for i:2 thru length(l) do (a:gcd(a,l[i])),simp), return(a)) ! else ret:"FAIL", return(ret) )$ /* anyfloats(l) returns true if any of the list are floats */ anyfloat(l) := block([ret], ! ret:FALSE, ! if listp(l)=FALSE then ret:"FAIL", ev(l:map('floatnump,l),simp), ! ev(for i:1 thru length(l) do (ret:ret OR l[i]),simp), return(ret) )$ /* Decides is any floats are in the expression. */ ! anyfloatex(ex) := block([PARTSWITCH,ret,kloop], ! ret:FALSE, ex:ev(ex,simp), ! IF floatnump(ex) THEN return(TRUE), ! IF atom(ex) THEN return(FALSE), ! PARTSWITCH:TRUE, ! ev(FOR kloop:1 WHILE PART(ex,kloop)#END DO ! ret:ret OR anyfloatex(PART(ex,kloop)),simp), return(ret) )$ --- 405,428 ---- ev(for i:2 thru length(l) do (a:gcd(a,l[i])),simp), return(a)) ! else ret:"fail", return(ret) )$ /* anyfloats(l) returns true if any of the list are floats */ anyfloat(l) := block([ret], ! ret:false, ! if listp(l)=false then ret:"fail", ev(l:map('floatnump,l),simp), ! ev(for i:1 thru length(l) do (ret:ret or l[i]),simp), return(ret) )$ /* Decides is any floats are in the expression. */ ! anyfloatex(ex) := block([partswitch,ret,kloop], ! ret:false, ex:ev(ex,simp), ! if floatnump(ex) then return(true), ! if atom(ex) then return(false), ! partswitch:true, ! ev(for kloop:1 while part(ex,kloop)#end do ! ret:ret or anyfloatex(part(ex,kloop)),simp), return(ret) )$ *************** *** 430,443 **** */ Stack_Test(SA,SB) := ! block([KEEPFLOAT,TRIGEXPAND,LOGEXPAND,ex], ! TRIGEXPAND:TRUE, /* See pg 80 */ ! LOGEXPAND:SUPER, ! KEEPFLOAT:TRUE, /* See pg 23 */ ex:errcatch(ev(trigreduce(trigexpand(trigrat(SA-SB))),simp,fullratsimp,nouns)), ! if ex=[] then return(FALSE), ex:ex[1], ! if floatnump(ex) then return(FALSE), ex:trigsimp(ex), ! if fullratsimp(ex)=0 then return(TRUE) else return(FALSE) )$ --- 436,449 ---- */ Stack_Test(SA,SB) := ! block([keepfloat,trigexpand,logexpand,ex], ! trigexpand:true, /* see pg 80 */ ! logexpand:super, ! keepfloat:true, /* see pg 23 */ ex:errcatch(ev(trigreduce(trigexpand(trigrat(SA-SB))),simp,fullratsimp,nouns)), ! if ex=[] then return(false), ex:ex[1], ! if floatnump(ex) then return(false), ex:trigsimp(ex), ! if fullratsimp(ex)=0 then return(true) else return(false) )$ *************** *** 476,483 **** ATAlgEquivfun(SA,SB) := block([KEEPFLOAT,RawMark,FeedBack,AnswerNote,ret], RawMark:0, FeedBack:"", AnswerNote:"", ! KEEPFLOAT:TRUE, /* See pg 23 */ /* Are we dealing with matrices? */ if matrixp(SB) then ! if matrixp(SA)#TRUE then return([false,0,"ATAlgEquiv_SA_not_matrix",StackAddFeedback("","ATAlgEquiv_SA_not_matrix")]) else --- 482,489 ---- ATAlgEquivfun(SA,SB) := block([KEEPFLOAT,RawMark,FeedBack,AnswerNote,ret], RawMark:0, FeedBack:"", AnswerNote:"", ! keepfloat:true, /* See pg 23 */ /* Are we dealing with matrices? */ if matrixp(SB) then ! if matrixp(SA)#true then return([false,0,"ATAlgEquiv_SA_not_matrix",StackAddFeedback("","ATAlgEquiv_SA_not_matrix")]) else *************** *** 485,489 **** /* Are we dealing with lists? */ if listp(SB) then ! if listp(SA)#TRUE then return([false,0,"ATAlgEquiv_SA_not_list",StackAddFeedback("","ATAlgEquiv_SA_not_list")]) else --- 491,495 ---- /* Are we dealing with lists? */ if listp(SB) then ! if listp(SA)#true then return([false,0,"ATAlgEquiv_SA_not_list",StackAddFeedback("","ATAlgEquiv_SA_not_list")]) else *************** *** 491,495 **** /* Are we dealing with an equation? */ if equationp(SB) then ! if equationp(SA)#TRUE then return([false,0,"ATAlgEquiv_SA_not_equation",StackAddFeedback("","ATAlgEquiv_SA_not_equation")]) else --- 497,501 ---- /* Are we dealing with an equation? */ if equationp(SB) then ! if equationp(SA)#true then return([false,0,"ATAlgEquiv_SA_not_equation",StackAddFeedback("","ATAlgEquiv_SA_not_equation")]) else *************** *** 499,503 **** /* Are we dealing with an equation? */ if inequalityp(SB) then ! if inequalityp(SA)#TRUE then return([false,0,"ATAlgEquiv_SA_not_inequality",StackAddFeedback("","ATAlgEquiv_SA_not_inequality")]) else --- 505,509 ---- /* Are we dealing with an equation? */ if inequalityp(SB) then ! if inequalityp(SA)#true then return([false,0,"ATAlgEquiv_SA_not_inequality",StackAddFeedback("","ATAlgEquiv_SA_not_inequality")]) else *************** *** 505,509 **** /* Are we dealing with lists? */ if setp(SB) then ! if setp(SA)#TRUE then return([false,0,"ATAlgEquiv_SA_not_set",StackAddFeedback("","ATAlgEquiv_SA_not_set")]) else --- 511,515 ---- /* Are we dealing with lists? */ if setp(SB) then ! if setp(SA)#true then return([false,0,"ATAlgEquiv_SA_not_set",StackAddFeedback("","ATAlgEquiv_SA_not_set")]) else *************** *** 526,530 **** SAl : length(SA), SBl : length(SB), ! if (SAl#SBl) THEN return([true,0,"ATList_wronglen",StackAddFeedback("","ATList_wronglen",StackDISP(SBl,"\$"),StackDISP(SAl,"\$"))]), --- 532,536 ---- SAl : length(SA), SBl : length(SB), ! if (SAl#SBl) then return([true,0,"ATList_wronglen",StackAddFeedback("","ATList_wronglen",StackDISP(SBl,"\$"),StackDISP(SAl,"\$"))]), *************** *** 584,590 **** SBc : length(SB[1]), FeedBack:StackAddFeedback("","ATMatrix_wrongsz",StackDISP(SBr,"\$"),StackDISP(SBc,"\$"),StackDISP(SAr,"\$"),StackDISP(SAc,"\$")), ! if (SAr#SBr) THEN return([true,0,"ATMatrix_wrongsz rows",FeedBack]), ! if (SAc#SBc) THEN return([true,0,"ATMatrix_wrongsz columns",FeedBack]), FeedBack:"", --- 590,596 ---- SBc : length(SB[1]), FeedBack:StackAddFeedback("","ATMatrix_wrongsz",StackDISP(SBr,"\$"),StackDISP(SBc,"\$"),StackDISP(SAr,"\$"),StackDISP(SAc,"\$")), ! if (SAr#SBr) then return([true,0,"ATMatrix_wrongsz rows",FeedBack]), ! if (SAc#SBc) then return([true,0,"ATMatrix_wrongsz columns",FeedBack]), FeedBack:"", *************** *** 700,708 **** else ( AnswerNote:"Incorrect" ), ! return(StackReturnOb("true",STRING(RawMark),AnswerNote,FeedBack)) )$ ! /* irred_Q(p,v) is TRUE iff */ /* assumes all coefficients of p are integers */ /* (1) p is degree 0 in v */ --- 706,714 ---- else ( AnswerNote:"Incorrect" ), ! return(StackReturnOb("true",string(RawMark),AnswerNote,FeedBack)) )$ ! /* irred_Q(p,v) is true iff */ /* assumes all coefficients of p are integers */ /* (1) p is degree 0 in v */ *************** *** 713,738 **** /* Is p an irreducible term in v, over the rationals Q? */ ! /* Returns a list, of [TRUE/FALSE , FeedBack] */ irred_Q(p,v) := block([ret,deg], deg:degree(p,v), ! ret:[TRUE,""], /* Takes care of the degree zero, ie number, or other cases */ if deg=1 then ret:block([lt], lt:ev(bothcoef(p,v),simp), ! if lt[1]=1 or lt[2]= 1 then return([TRUE,""]), ! if (integerp(lt[1]) and integerp(lt[2]) and gcd(lt[1],lt[2])>1) then return([FALSE,StackAddFeedback("","irred_Q_commonint")]) ! else (if factorp(p) then return([TRUE,""]) else return([FALSE,StackAddFeedback("","irred_Q_commonint")]) )), if deg=2 then ret:block([a,b,c,h], a:coeff(p,v,2), b:coeff(p,v,1), c:coeff(p,v,0), ! if all_listp('integerp,[a,b,c])=FALSE then ! (if factorp(p) then return([TRUE,""]) else return([FALSE,""])), ! if (a=1 and b=0 and c=0) then return([TRUE,""]), ! if (b=0 and c=0 and a>1 and ratnump(sqrt(a))) then return([TRUE,StackAddFeedback("","irred_Q_optional_fac",StackDISP(p,"$"))]), h:commonfaclist([a,b,c]), /*Check there is no linear factor */ ! if h>1 then return([FALSE,StackAddFeedback("","irred_Q_commonint")]), ! if (ratnump(sqrt(b^2-4*a*c))) then return([FALSE,""]) else return(ret)), if deg>2 then ! if p=factor(p) then return([TRUE,""]) else return([FALSE,""]), return(ret) ); --- 719,744 ---- /* Is p an irreducible term in v, over the rationals Q? */ ! /* Returns a list, of [true/false , FeedBack] */ irred_Q(p,v) := block([ret,deg], deg:degree(p,v), ! ret:[true,""], /* Takes care of the degree zero, ie number, or other cases */ if deg=1 then ret:block([lt], lt:ev(bothcoef(p,v),simp), ! if lt[1]=1 or lt[2]= 1 then return([true,""]), ! if (integerp(lt[1]) and integerp(lt[2]) and gcd(lt[1],lt[2])>1) then return([false,StackAddFeedback("","irred_Q_commonint")]) ! else (if factorp(p) then return([true,""]) else return([false,StackAddFeedback("","irred_Q_commonint")]) )), if deg=2 then ret:block([a,b,c,h], a:coeff(p,v,2), b:coeff(p,v,1), c:coeff(p,v,0), ! if all_listp('integerp,[a,b,c])=false then ! (if factorp(p) then return([true,""]) else return([false,""])), ! if (a=1 and b=0 and c=0) then return([true,""]), ! if (b=0 and c=0 and a>1 and ratnump(sqrt(a))) then return([true,StackAddFeedback("","irred_Q_optional_fac",StackDISP(p,"$"))]), h:commonfaclist([a,b,c]), /*Check there is no linear factor */ ! if h>1 then return([false,StackAddFeedback("","irred_Q_commonint")]), ! if (ratnump(sqrt(b^2-4*a*c))) then return([false,""]) else return(ret)), if deg>2 then ! if p=factor(p) then return([true,""]) else return([false,""]), return(ret) ); *************** *** 742,762 **** FacForm_UnPick(p,v) := block([NEGDISTRIB,PARTSWITCH,fb,i,irred,res], ! NEGDISTRIB:FALSE, ! PARTSWITCH:TRUE, fb:"", ! res:TRUE, ! if ATOM(p) then return([TRUE,""]) else if op(p)="+" then return(irred_Q(p,v)) else if op(p)="^" then return(irred_Q(part(p,1),v)), /* So we have a *, or a / */ ! FOR i:1 STEP 1 WHILE ev(part(p,i),simp)#END DO ( /* We just need to go one level down! */ irred:block([q], q:part(p,ev(i,simp)), ! if ATOM(q) then return([TRUE,""]) else if op(q)="+" then return(irred_Q(q,v)) else ! if op(q)="^" then return(irred_Q(part(q,1),v)) else return([FALSE,""]) ), ! res:res AND irred[1], ! if irred[1]=FALSE then (fb:StackAddFeedback(fb,"FacForm_UnPick_morework",StackDISP(part(p,ev(i,simp)),"\$")), fb:concat(fb,irred[2]), --- 748,768 ---- FacForm_UnPick(p,v) := block([NEGDISTRIB,PARTSWITCH,fb,i,irred,res], ! negdistrib:false, ! partswitch:true, fb:"", ! res:true, ! if ATOM(p) then return([true,""]) else if op(p)="+" then return(irred_Q(p,v)) else if op(p)="^" then return(irred_Q(part(p,1),v)), /* So we have a *, or a / */ ! for i:1 step 1 while ev(part(p,i),simp)#end do ( /* We just need to go one level down! */ irred:block([q], q:part(p,ev(i,simp)), ! if ATOM(q) then return([true,""]) else if op(q)="+" then return(irred_Q(q,v)) else ! if op(q)="^" then return(irred_Q(part(q,1),v)) else return([false,""]) ), ! res:res and irred[1], ! if irred[1]=false then (fb:StackAddFeedback(fb,"FacForm_UnPick_morework",StackDISP(part(p,ev(i,simp)),"\$")), fb:concat(fb,irred[2]), *************** *** 782,786 **** /* If we don't have an atom as the teacher's variable, then we need to make a substitution */ ! if atom(v)#TRUE then (SA:subst(facdum,v,SA),SB:subst(facdum,v,SB),v:facdum), if errcatch(deg:degree(SA,v))=[] then return(StackReturnOb("false","0","ATFacForm_error_degreeSA",StackAddFeedback("","ATFacForm_error_degreeSA"))), --- 788,792 ---- /* If we don't have an atom as the teacher's variable, then we need to make a substitution */ ! if atom(v)#true then (SA:subst(facdum,v,SA),SB:subst(facdum,v,SB),v:facdum), if errcatch(deg:degree(SA,v))=[] then return(StackReturnOb("false","0","ATFacForm_error_degreeSA",StackAddFeedback("","ATFacForm_error_degreeSA"))), *************** *** 793,797 **** return(StackReturnOb("true","0","Incorrect_int","")), /* Check for the correct answer. */ ! if (aequiv AND factorp(SA)) then return(StackReturnOb("true","1","Correct","")), if (factorp(SA)) then /* We need to provide some feedback, if possible */ --- 799,803 ---- return(StackReturnOb("true","0","Incorrect_int","")), /* Check for the correct answer. */ ! if (aequiv and factorp(SA)) then return(StackReturnOb("true","1","Correct","")), if (factorp(SA)) then /* We need to provide some feedback, if possible */ *************** *** 799,813 **** else ( up:FacForm_UnPick(SA,v) ), ! if (up[1]=FALSE) then ( RawMark:0, AnswerNote:concat(AnswerNote,"ATFacForm_notfactored. "), FeedBack:StackAddFeedback(FeedBack,"ATFacForm_notfactored"), FeedBack:concat(FeedBack,up[2])) else ( AnswerNote:concat(AnswerNote,"Correct (by default) ") ), /* Check for algebraic equivalence */ ! if (TRUE#aequiv) then (RawMark:0, AnswerNote:concat(AnswerNote,"ATFacForm_notalgequiv "), FeedBack:StackAddFeedback(FeedBack,"ATFacForm_notalgequiv"), ! cont:FALSE ), if (quiet) then FeedBack:"", ! return(StackReturnOb("true",STRING(RawMark),AnswerNote,FeedBack)) )$ --- 805,819 ---- else ( up:FacForm_UnPick(SA,v) ), ! if (up[1]=false) then ( RawMark:0, AnswerNote:concat(AnswerNote,"ATFacForm_notfactored. "), FeedBack:StackAddFeedback(FeedBack,"ATFacForm_notfactored"), FeedBack:concat(FeedBack,up[2])) else ( AnswerNote:concat(AnswerNote,"Correct (by default) ") ), /* Check for algebraic equivalence */ ! if (true#aequiv) then (RawMark:0, AnswerNote:concat(AnswerNote,"ATFacForm_notalgequiv "), FeedBack:StackAddFeedback(FeedBack,"ATFacForm_notalgequiv"), ! cont:false ), if (quiet) then FeedBack:"", ! return(StackReturnOb("true",string(RawMark),AnswerNote,FeedBack)) )$ *************** *** 818,822 **** block([KEEPFLOAT,RawMark,FeedBack,AnswerNote,str], RawMark:0, FeedBack:"", AnswerNote:"", ! KEEPFLOAT:TRUE, /* See pg 23 */ /* SA should be only an expression. */ if expressionp(SA)=false then --- 824,828 ---- block([KEEPFLOAT,RawMark,FeedBack,AnswerNote,str], RawMark:0, FeedBack:"", AnswerNote:"", ! KEEPFLOAT:true, /* See pg 23 */ /* SA should be only an expression. */ if expressionp(SA)=false then *************** *** 845,849 **** ATPartFrac(SA,SBL) := block([NEGDISTRIB,val,rawmk,fb,ansnote,SB,v,quiet,facdum], ! NEGDISTRIB:FALSE, val:"true", rawmk:1, fb:StackAddFeedback("","AT_NOTIMPLEMENTED"), ansnote:"", /* SBL is a list: the teacher's answer, the variable, and whether formative feedback is to be provided. */ --- 851,855 ---- ATPartFrac(SA,SBL) := block([NEGDISTRIB,val,rawmk,fb,ansnote,SB,v,quiet,facdum], ! NEGDISTRIB:false, val:"true", rawmk:1, fb:StackAddFeedback("","AT_NOTIMPLEMENTED"), ansnote:"", /* SBL is a list: the teacher's answer, the variable, and whether formative feedback is to be provided. */ *************** *** 856,860 **** /* If we don't have an atom as the teacher's variable, then we need to make a substitution */ ! if atom(v)#TRUE then (SA:subst(facdum,wrt,SA),tExpr:subst(facdum,wrt,tExpr),wrt:facdum), block([val, rawmk, ansnote, fb], sExpr: SA, --- 862,866 ---- /* If we don't have an atom as the teacher's variable, then we need to make a substitution */ ! if atom(v)#true then (SA:subst(facdum,wrt,SA),tExpr:subst(facdum,wrt,tExpr),wrt:facdum), block([val, rawmk, ansnote, fb], sExpr: SA, *************** *** 967,971 **** ATSingleFrac(sExpr, TList):= block( [NEGDISTRIB, val, rawmk, fb, ansnote, tExpr, quiet, facdum], ! NEGDISTRIB: FALSE, val:"", rawmk:"1", fb: StackAddFeedback("","AT_NOTIMPLEMENTED"), ansnote:"", --- 973,977 ---- ATSingleFrac(sExpr, TList):= block( [NEGDISTRIB, val, rawmk, fb, ansnote, tExpr, quiet, facdum], ! NEGDISTRIB: false, val:"", rawmk:"1", fb: StackAddFeedback("","AT_NOTIMPLEMENTED"), ansnote:"", *************** *** 1032,1036 **** ), ret: StackReturnOb(val,rawmk,ansnote,fb), ! if quiet # TRUE then fb:"", return(ret) ) --- 1038,1042 ---- ), ret: StackReturnOb(val,rawmk,ansnote,fb), ! if quiet # true then fb:"", return(ret) ) *************** *** 1069,1073 **** /* requires: Students partial Fraction part */ /* Teachers Partial Fraction part */ ! /* returns: Boolean TRUE iff denominators are equivalent */ /* false otherwise */ /* ************************************************************ */ --- 1075,1079 ---- /* requires: Students partial Fraction part */ /* Teachers Partial Fraction part */ ! /* returns: Boolean true iff denominators are equivalent */ /* false otherwise */ /* ************************************************************ */ *************** *** 1112,1116 **** /* requires: Students partial Fraction part */ /* Teachers Partial Fraction part */ ! /* returns: Boolean TRUE iff numerators are equivalent */ /* false otherwise */ /* ************************************************************ */ --- 1118,1122 ---- /* requires: Students partial Fraction part */ /* Teachers Partial Fraction part */ ! /* returns: Boolean true iff numerators are equivalent */ /* false otherwise */ /* ************************************************************ */ *************** *** 1127,1132 **** /* ***************Variables used the Same********************** */ /* requires: 2 Expressions */ ! /* returns: TRUE: iff expr 1 and expr2 contain same vars */ ! /* FALSE: otherwise */ /* ************************************************************ */ --- 1133,1138 ---- /* ***************Variables used the Same********************** */ /* requires: 2 Expressions */ ! /* returns: true: iff expr 1 and expr2 contain same vars */ ! /* false: otherwise */ /* ************************************************************ */ *************** *** 1150,1155 **** old_simp:simp, simp:true, RawMark:0, FeedBack:"", AnswerNote:"", /* SBL is a list: the teacher's answer, the variable, and whether formative feedback is to be provided. */ ! if listp(sbl) then (var:sbl[2], sb:diff(sbl[1],var), cont:TRUE) else ! ( cont:FALSE, FeedBack:StackAddFeedback("","ATInt_error_list"), AnswerNote:"ATInt_error_list"), /* SA should be only an expression. */ --- 1156,1161 ---- old_simp:simp, simp:true, RawMark:0, FeedBack:"", AnswerNote:"", /* SBL is a list: the teacher's answer, the variable, and whether formative feedback is to be provided. */ ! if listp(sbl) then (var:sbl[2], sb:diff(sbl[1],var), cont:true) else ! ( cont:false, FeedBack:StackAddFeedback("","ATInt_error_list"), AnswerNote:"ATInt_error_list"), /* SA should be only an expression. */ *************** *** 1157,1161 **** return(StackReturnOb("false","0","ATInt_SA_not_expression",StackAddFeedback("","ATAlgEquiv_SA_not_expression"))), ! KEEPFLOAT:TRUE, /* See pg 23 */ if cont then (ans : int(sb,var), --- 1163,1167 ---- return(StackReturnOb("false","0","ATInt_SA_not_expression",StackAddFeedback("","ATAlgEquiv_SA_not_expression"))), ! KEEPFLOAT:true, /* See pg 23 */ if cont then (ans : int(sb,var), *************** *** 1180,1184 **** ), /* End of cont loop */ simp:old_simp, ! return(StackReturnOb("true",STRING(RawMark),AnswerNote,FeedBack)) )$ --- 1186,1190 ---- ), /* End of cont loop */ simp:old_simp, ! return(StackReturnOb("true",string(RawMark),AnswerNote,FeedBack)) )$ *************** *** 1189,1194 **** old_simp:simp, simp:true, RawMark:0, FeedBack:"", AnswerNote:"", /* SBL is a list: the teacher's answer, the variable, and whether formative feedback is to be provided. */ ! if listp(sbl) then (var:sbl[2], sb:sbl[1], cont:TRUE) else ! ( cont:FALSE, FeedBack:StackAddFeedback("","ATDiff_error_list"), AnswerNote:"ATDiff_error_list"), /* SA should be only an expression. */ --- 1195,1200 ---- old_simp:simp, simp:true, RawMark:0, FeedBack:"", AnswerNote:"", /* SBL is a list: the teacher's answer, the variable, and whether formative feedback is to be provided. */ ! if listp(sbl) then (var:sbl[2], sb:sbl[1], cont:true) else ! ( cont:false, FeedBack:StackAddFeedback("","ATDiff_error_list"), AnswerNote:"ATDiff_error_list"), /* SA should be only an expression. */ *************** *** 1196,1200 **** return(StackReturnOb("false","0","ATDiff_SA_not_expression",StackAddFeedback("","ATAlgEquiv_SA_not_expression"))), ! KEEPFLOAT:TRUE, /* See pg 23 */ if cont then ( --- 1202,1206 ---- return(StackReturnOb("false","0","ATDiff_SA_not_expression",StackAddFeedback("","ATAlgEquiv_SA_not_expression"))), ! KEEPFLOAT:true, /* See pg 23 */ if cont then ( *************** *** 1206,1210 **** ), /* End of cont loop */ simp:old_simp, ! return(StackReturnOb("true",STRING(RawMark),AnswerNote,FeedBack)) )$ --- 1212,1216 ---- ), /* End of cont loop */ simp:old_simp, ! return(StackReturnOb("true",string(RawMark),AnswerNote,FeedBack)) )$ *************** *** 1219,1233 **** /* ex is assumed to be an expression of the form, a*f(b*x+c)+d */ /* That is to say, the result of applying some kind of grpahical transformation to f. */ ! /* If the function sucesfully unpacks this, it returns the list [TRUE,a,b,c,d] */ ! /* If the function fails, it returns [FALSE,a,b,c,d], where it goes as far as it can. */ fntrans_unpack(ex):=block([f,l,aa,bb,cc,dd], l:ex, ! if atom(l) then return([FALSE,aa,bb,cc,dd]), if op(l)="+" then (dd:part(l,2),l:part(l,1)) else dd:0, ! if atom(l) then return([FALSE,aa,bb,cc,dd]), if op(l)="*" then (aa:part(l,1),l:part(l,2)) else aa:1, ! if op(l)=f then (l:part(l,1),bb:coeff(l,x,1),cc:coeff(l,x,0)) else return([FALSE,aa,bb,cc,dd]), ! /* if atom(l) then return([FALSE,aa,bb,cc,dd]), */ ! return([TRUE,aa,bb,cc,dd]) )$ --- 1225,1239 ---- /* ex is assumed to be an expression of the form, a*f(b*x+c)+d */ /* That is to say, the result of applying some kind of grpahical transformation to f. */ ! /* If the function sucesfully unpacks this, it returns the list [true,a,b,c,d] */ ! /* If the function fails, it returns [false,a,b,c,d], where it goes as far as it can. */ fntrans_unpack(ex):=block([f,l,aa,bb,cc,dd], l:ex, ! if atom(l) then return([false,aa,bb,cc,dd]), if op(l)="+" then (dd:part(l,2),l:part(l,1)) else dd:0, ! if atom(l) then return([false,aa,bb,cc,dd]), if op(l)="*" then (aa:part(l,1),l:part(l,2)) else aa:1, ! if op(l)=f then (l:part(l,1),bb:coeff(l,x,1),cc:coeff(l,x,0)) else return([false,aa,bb,cc,dd]), ! /* if atom(l) then return([false,aa,bb,cc,dd]), */ ! return([true,aa,bb,cc,dd]) )$ Index: initmaxima.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/scripts/maxima/initmaxima.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** initmaxima.php 8 Nov 2005 09:41:40 -0000 1.7 --- initmaxima.php 6 Feb 2006 12:33:12 -0000 1.8 *************** *** 21,25 **** $maxloc .= "/* Add the location to Maxima's search path */\n"; ! $maxloc .= "FILE_SEARCH_MAXIMA:cons( \"{$stack_root}/scripts/maxima/###".'.{mac,mc}" , FILE_SEARCH_MAXIMA)$'."\n"; foreach ($maximalocal as $var => $val) { --- 21,25 ---- $maxloc .= "/* Add the location to Maxima's search path */\n"; ! $maxloc .= "file_search_maxima:cons( \"{$stack_root}/scripts/maxima/###".'.{mac,mc}" , file_search_maxima)$'."\n"; foreach ($maximalocal as $var => $val) { |
|
From: Chris S. <san...@us...> - 2006-02-06 12:33:23
|
Update of /cvsroot/stack/stack-1-0 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15339 Modified Files: stackConfig.php.dist Log Message: Changes from Maxima 5.9.1 to Maxima 5.9.2 Index: stackConfig.php.dist =================================================================== RCS file: /cvsroot/stack/stack-1-0/stackConfig.php.dist,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** stackConfig.php.dist 27 Nov 2005 11:30:52 -0000 1.7 --- stackConfig.php.dist 6 Feb 2006 12:33:12 -0000 1.8 *************** *** 82,95 **** // MAXIMA if ('win' == $stack_os) { ! // In windows, you should edit the batch scripts/install/stackmaxima.bat ! // and place it in your windows PATH. ! //$stack_cas['command'] = 'stackmaxima'; ! $stack_cas['command'] = $stack_root.'\scripts\install\stackmaxima.bat'; } else { $stack_cas['command'] = 'maxima'; } - $stack_cas['cas'] = 'maxima'; $stack_cas['strict'] = TRUE; // Does this check for words in every entry? $stack_cas['inputDir'] = $stack_root."/scripts/maxima/".$stack_cas['cas']."/"; --- 82,103 ---- // MAXIMA + $stack_cas['cas'] = 'maxima'; + $stack_cas['version'] = '5.9.1'; + + // MAXIMA if ('win' == $stack_os) { ! // This does its best to find your version of Maxima... ! if ('5.9.1' == $stack_cas['version']) { ! $stack_cas['command'] = '"'.$stack_root.'/scripts/install/stackmaxima_5.9.1.bat"'; ! } else if ('5.9.2' == $stack_cas['version']) { ! $stack_cas['command'] = '"'.$stack_root.'/scripts/install/stackmaxima_5.9.2.bat"'; ! } else { ! //$stack_cas['command'] = 'stackmaxima'; ! $stack_cas['command'] = 'maxima'; ! } } else { $stack_cas['command'] = 'maxima'; } $stack_cas['strict'] = TRUE; // Does this check for words in every entry? $stack_cas['inputDir'] = $stack_root."/scripts/maxima/".$stack_cas['cas']."/"; *************** *** 106,109 **** --- 114,118 ---- /***************************************************/ + $maximalocal['MAXIMA_VERSION'] = $stack_cas['version']; // Implementation of images. // Use UNIX slashes in filenames: these get sorted in initmaxima.php, for Windows *************** *** 112,117 **** $maximalocal['URL_BASE'] = $stack_web_url.$stack_tmpdir.'/'; // These are used by the GNUplot "set terminal" command. ! $maximalocal['PLOT_TERMINAL'] = 'png'; // Either 'png' or 'gif' ! $maximalocal['PLOT_TERM_OPT'] = 'transparent size 450,300'; // Windows --- 121,126 ---- $maximalocal['URL_BASE'] = $stack_web_url.$stack_tmpdir.'/'; // These are used by the GNUplot "set terminal" command. ! $maximalocal['plot_terminal'] = 'png'; // Either 'png' or 'gif' ! $maximalocal['plot_term_opt'] = 'transparent size 450,300'; // Windows |
|
From: Chris S. <san...@us...> - 2006-02-06 12:33:22
|
Update of /cvsroot/stack/stack-1-0/lang/en/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15339/lang/en/doc Modified Files: about_install.php Log Message: Changes from Maxima 5.9.1 to Maxima 5.9.2 Index: about_install.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/lang/en/doc/about_install.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** about_install.php 29 Nov 2005 11:23:17 -0000 1.10 --- about_install.php 6 Feb 2006 12:33:12 -0000 1.11 *************** *** 49,54 **** <li>You need to convex LaTeX to HTML with <a href="http://hutchinson.belmont.ma.us/tth/">TtH</a>. <li>The computer algebra system <a href="http://maxima.sourceforge.net/">Maxima</a> (<a href="#cas">see below</a>). ! Version 5.9.1 is needed. Version 5.9.2 is the ! latest release, but is not currently supported - this will change in the near future. (Note, for those on a Microsoft platform, the <a href="http://wxmaxima.sourceforge.net/">wxMaxima</a> front end is much better than that distributed with Maxima itself and is well worth installing for --- 49,54 ---- <li>You need to convex LaTeX to HTML with <a href="http://hutchinson.belmont.ma.us/tth/">TtH</a>. <li>The computer algebra system <a href="http://maxima.sourceforge.net/">Maxima</a> (<a href="#cas">see below</a>). ! Version 5.9.1 is supported. Version 5.9.2 is the ! latest release, and is currently supported for testing only. (Note, for those on a Microsoft platform, the <a href="http://wxmaxima.sourceforge.net/">wxMaxima</a> front end is much better than that distributed with Maxima itself and is well worth installing for |
|
From: Chris S. <san...@us...> - 2006-02-06 12:33:22
|
Update of /cvsroot/stack/stack-1-0/scripts/install In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15339/scripts/install Added Files: stackmaxima_5.9.1.bat stackmaxima_5.9.2.bat Log Message: Changes from Maxima 5.9.1 to Maxima 5.9.2 --- NEW FILE: stackmaxima_5.9.2.bat --- @echo off set lisp=gcl set version=5.9.2 set prefix=c:/maxima set maxima_prefix=C:\PROGRA~1\MAXIMA~1.2 set package=maxima set verbose=false set maxima_imagesdir=%prefix%\src "C:\Program Files\Maxima-5.9.2\lib\maxima\5.9.2\binary-gcl\maxima.exe" -eval "(user::run)" --- NEW FILE: stackmaxima_5.9.1.bat --- @echo off set lisp=gcl set version=5.9.1 set prefix=c:/maxima set maxima_prefix=C:\PROGRA~1\MAXIMA~1.1 set package=maxima set verbose=false set maxima_imagesdir=%prefix%\src "C:\Program Files\Maxima-5.9.1\lib\maxima\5.9.1\binary-gcl\maxima.exe" -eval "(user::run)" |
|
From: Chris S. <san...@us...> - 2006-02-06 12:33:20
|
Update of /cvsroot/stack/stack-1-0/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15339/scripts Modified Files: stackWin.php Log Message: Changes from Maxima 5.9.1 to Maxima 5.9.2 Index: stackWin.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/scripts/stackWin.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** stackWin.php 27 Nov 2005 11:30:52 -0000 1.16 --- stackWin.php 6 Feb 2006 12:33:12 -0000 1.17 *************** *** 89,93 **** global $stack_root,$stack_logfiles,$stack_cas; ! $debug = false; if (array_key_exists('debug',$_GET)) { $debug = TRUE; --- 89,93 ---- global $stack_root,$stack_logfiles,$stack_cas; ! $debug = FALSE; if (array_key_exists('debug',$_GET)) { $debug = TRUE; |
|
From: Chris S. <san...@us...> - 2006-01-30 09:25:50
|
Update of /cvsroot/stack/stack-1-0/scripts/maxima In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5826/scripts/maxima Modified Files: stackmaxima.mac Log Message: Index: stackmaxima.mac =================================================================== RCS file: /cvsroot/stack/stack-1-0/scripts/maxima/stackmaxima.mac,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** stackmaxima.mac 27 Nov 2005 11:30:52 -0000 1.52 --- stackmaxima.mac 30 Jan 2006 09:25:41 -0000 1.53 *************** *** 142,148 **** /* Test code */ ! /* for I:1 thru 10 do b[I]:0; ! for I:1 thru 10000 do (j:(1+rand(10)),b[j]:b[j]+1)$ ! for I:1 thru 10 do print(b[I]); */ --- 142,153 ---- /* Test code */ ! /* ! randtest(tn):= block([b], ! b:makelist(0,x,0,(tn-1)), ! for I:1 thru 1000 do (j:(ev(1+rand(tn),simp)),b[j]:b[j]+1), ! return(b)); ! ! for I:2 thru 10 do (print("New test: ",I),rt:randtest(I),print(rt)); ! */ *************** *** 1228,1231 **** /* Stack expects some output */ ! simp:false; print("[ Stack-Maxima started ]"); --- 1233,1236 ---- /* Stack expects some output */ ! print("[ Stack-Maxima started ]"); |
|
From: Chris S. <san...@us...> - 2006-01-30 09:25:50
|
Update of /cvsroot/stack/stack-1-0/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5826/scripts Modified Files: stackQuestion.php Log Message: Index: stackQuestion.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/scripts/stackQuestion.php,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** stackQuestion.php 27 Jan 2006 11:42:10 -0000 1.57 --- stackQuestion.php 30 Jan 2006 09:25:42 -0000 1.58 *************** *** 1,5 **** <?php ! /** * This file contains most functions which deal with questions. These are the * everyday functions used by students, and it is rare indeed that this file is not --- 1,5 ---- <?php ! /** * This file contains most functions which deal with questions. These are the [...2127 lines suppressed...] } --- 2403,2420 ---- $question['questionPublisher'] = $stack_web_url; $question['type'] = 'question'; ! if (empty($remoteUser)) { $question['questionUserLastEdited'] = $user['firstname']." ".$user['lastname']; ! if ($user['email']!='') { //<TODO: need to somehow retrieve the RQP user who is making new question $question['questionUserLastEdited'].=' <'.$user['email'].'>'; } } ! else { $question['questionUserLastEdited'] = $remoteUser; } ! return $question; } |
|
From: Chris S. <san...@us...> - 2006-01-27 12:42:16
|
Update of /cvsroot/stack/stack-1-0/scripts/install In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10683/scripts/install Modified Files: sample_questions.xml Log Message: Index: sample_questions.xml =================================================================== RCS file: /cvsroot/stack/stack-1-0/scripts/install/sample_questions.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** sample_questions.xml 25 Apr 2005 18:09:46 -0000 1.5 --- sample_questions.xml 27 Jan 2006 12:42:01 -0000 1.6 *************** *** 1,597 **** ! <?xml version="1.0"?> ! <mathQuiz> ! <assessmentItem> ! <assessmentItem_ord order="0"> ! <questionVarsRaw>n = 3;m = 5;p = 2*(x-n)^2*(x-m);q = expand(p)</questionVarsRaw> ! <questionStem>Factorise \[ @q@, \] given that $(x-@n@)$ is a factor. </questionStem> ! <questionAns>p</questionAns> ! <questionAnsKey>ans1</questionAnsKey> [...2486 lines suppressed...] ! <ApLat>-1</ApLat> ! <AnswerNote>$y'(0)$ wrong.</AnswerNote> ! </false> ! </questionPotResp> ! <questionAnsVars order="3"> ! <key>b1</key> ! <val>ev(dsa,t=0,fullratsimp)</val> ! </questionAnsVars> ! <questionNote>@ta@</questionNote> ! <dc:identifier>MTEyOTc5NjQ4MjQ3Nzk4OD</dc:identifier> ! <dc:title>ODE_2nd_order_linear_3</dc:title> ! <dc:description>Second order linear ODE with constant coefficients, initial conds</dc:description> ! <lom:keyword>demo, ODE</lom:keyword> ! <dc:creator></dc:creator> ! <dc:publisher>http://www.stack.bham.ac.uk/</dc:publisher> ! <dc:type>question</dc:type> ! <dc:format>text/xml; charset="utf-8"</dc:format> ! <dc:date>2006-01-27 12:38:03</dc:date> </assessmentItem> </mathQuiz> |
|
From: Chris S. <san...@us...> - 2006-01-27 11:42:18
|
Update of /cvsroot/stack/stack-1-0/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23566/scripts Modified Files: stackCAS.php stackQuestion.php Log Message: Index: stackCAS.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/scripts/stackCAS.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** stackCAS.php 28 Nov 2005 14:10:01 -0000 1.15 --- stackCAS.php 27 Jan 2006 11:42:10 -0000 1.16 *************** *** 291,294 **** --- 291,295 ---- $cas_cmd .= " simp:false, "; $cas_cmd .= " print(\"[ Timestamp = [ 0 ], Ans= [ error = [\"), cte(\"ans\",errcatch(ans:$exp1)),"; + $cas_cmd .= " print(\" ListOfVariables = [ \"), print(listofvars(ans)), print(\" ], \"),"; $cas_cmd .= " print(\" ValidationError = [ \"), str:stack_validate(ans), print(str),"; $cas_cmd .= " print(\" ], \"), print(str), return(true)); \n"; Index: stackQuestion.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/scripts/stackQuestion.php,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** stackQuestion.php 28 Nov 2005 14:10:01 -0000 1.56 --- stackQuestion.php 27 Jan 2006 11:42:10 -0000 1.57 *************** *** 113,116 **** --- 113,122 ---- $stackOptions['Forbid']['default'] = ''; + // An autogenerated list of implicitly Forbidden strings, such as variable names used in a question; + // There is no user interface to this option. + $stackOptions['Forbid_implicit']['type'] = 'string'; + $stackOptions['Forbid_implicit']['values'] = ''; + $stackOptions['Forbid_implicit']['default'] = ''; + // 'Allowed words'; $stackOptions['Allow']['type'] = 'string'; *************** *** 1315,1319 **** // We do not want the student to be able to type in one of the question variables. ! // Hence we add these to the forbidden strings. // A teacher could always allow these if needed. if ( array_key_exists('questionVarsInst',$questionInst) ) { --- 1321,1325 ---- // We do not want the student to be able to type in one of the question variables. ! // Hence we add these to an option Forbid_implicit. // A teacher could always allow these if needed. if ( array_key_exists('questionVarsInst',$questionInst) ) { *************** *** 1325,1345 **** } ! // (2) Get any pre-existing options ! $forbid = ''; ! if (array_key_exists('questionOptions',$questionInst)) { ! if (array_key_exists('Forbid',$questionInst['questionOptions'])) { ! $forbid = $questionInst['questionOptions']['Forbid']; ! } ! } ! ! // (3) Sort out any comma problems. ! if ('' == $forbid) { // knock off the comma ! $forbid = substr($forbidvars, 1, strlen($forbidvars)-1); ! } else { ! $forbid .= $forbidvars; ! } ! // (4) Insert these ! $questionInst['questionOptions']['Forbid'] = $forbid; } --- 1331,1339 ---- } ! // (2) Sort out any comma problems. ! $forbid = substr($forbidvars, 1, strlen($forbidvars)-1); ! // (3) Insert these ! $questionInst['questionOptions']['Forbid_implicit'] = $forbid; } *************** *** 1672,1675 **** --- 1666,1694 ---- } + // Unpack the ListofVariables. This comes back as a comma separated string list. + if (array_key_exists('Forbid_implicit',$options) AND array_key_exists('ListOfVariables',$this_attempt)) { + // (1) Get any variables in the student's answers. + $LoV = trim($this_attempt['ListOfVariables']); + // Chop off the ['s + $LoV = substr($LoV,1,strlen($LoV)-2); + $LoV = explode(',',$LoV); + // (2) Get an array of variables used in the question. + $forb = explode(',',$options['Forbid_implicit']); + $forb = array_unique(array_map('trim',$forb)); + + // (3) Loop accross the $L0V's (likely to be shorter the $forbs) + foreach ($LoV as $fword) { + if (in_array($fword,$forb)) { + + // Throw an error + $this_attempt['Valid'] = 'false'; + $this_attempt['AnswerNote'] .= ' Implicit_ForbidWord'; + $this_attempt['FeedBack'] .= '<br />'.get_string('ForbidWord','stack',$fword); + } + } // end (3) + + } + + return $this_attempt; *************** *** 1686,1698 **** function stack_question_inst_mark(&$questionInst,$options,$RawAns,&$errors) { global $stackQuestionPotResp,$stackAnswerTest; - $disp = $options['Display']; // (1) Validate the student's attempt $this_attempt = stack_question_validate_sa($RawAns,$options,$errors); ! $RawAns = $this_attempt['RawAns']; ! // (2) Do we have a valid & non-empty attempt? ! $CorrectAns = $questionInst['questionAnsInst']['value']; if ('true' == $this_attempt['Valid'] and '' != trim($RawAns) and '' != $CorrectAns) { --- 1705,1720 ---- function stack_question_inst_mark(&$questionInst,$options,$RawAns,&$errors) { global $stackQuestionPotResp,$stackAnswerTest; $disp = $options['Display']; // (1) Validate the student's attempt $this_attempt = stack_question_validate_sa($RawAns,$options,$errors); ! //show_array($this_attempt); ! // (2) Do any of the variables in the question appear in the student's answer. ! ! ! // (3) Do we have a valid & non-empty attempt? ! $RawAns = $this_attempt['RawAns']; ! $CorrectAns = $questionInst['questionAnsInst']['value']; if ('true' == $this_attempt['Valid'] and '' != trim($RawAns) and '' != $CorrectAns) { |
|
From: Chris S. <san...@us...> - 2006-01-27 11:42:18
|
Update of /cvsroot/stack/stack-1-0 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23566 Modified Files: question_bank.php Log Message: Index: question_bank.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/question_bank.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** question_bank.php 10 Dec 2005 16:51:14 -0000 1.19 --- question_bank.php 27 Jan 2006 11:42:09 -0000 1.20 *************** *** 275,278 **** --- 275,279 ---- if ('mark'==$action or 'validate'==$action) { + $options = stack_options_set($questionInst); $this_attempt = stack_question_inst_mark($questionInst,$options,$RawAns,$errors); $this_attempt['Action'] = $action; |
|
From: Chris S. <san...@us...> - 2006-01-12 11:40:25
|
Update of /cvsroot/stack/stack-1-0/lang/en/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13655/lang/en/doc Modified Files: author_commonsyntax.php Added Files: Rosetta.pdf Log Message: Index: author_commonsyntax.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/lang/en/doc/author_commonsyntax.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** author_commonsyntax.php 27 Nov 2005 11:30:52 -0000 1.7 --- author_commonsyntax.php 12 Jan 2006 11:39:43 -0000 1.8 *************** *** 19,23 **** Each CAS system uses a slightly different syntax, details of which are given in ! the invaluable <a href="doc/dev/Rosetta.pdf">Rosetta.pdf</a>. This makes moving from one to the other a difficult task. </p> --- 19,23 ---- Each CAS system uses a slightly different syntax, details of which are given in ! the invaluable <a href="Rosetta.pdf">Rosetta.pdf</a>. This makes moving from one to the other a difficult task. </p> --- NEW FILE: Rosetta.pdf --- %PDF-1.2 9 0 obj << /Type/Font /Subtype/Type1 /Name/F1 /FontDescriptor 8 0 R /BaseFont/PNBBBY+CMBX12 /FirstChar 33 /LastChar 196 /Widths[342.6 581 937.5 562.5 937.5 875 312.5 437.5 437.5 562.5 875 312.5 375 312.5 562.5 562.5 562.5 562.5 562.5 562.5 562.5 562.5 562.5 562.5 562.5 312.5 312.5 342.6 875 531.3 531.3 875 849.5 799.8 812.5 862.3 738.4 707.2 884.3 879.6 419 581 880.8 675.9 1067.1 879.6 844.9 768.5 844.9 839.1 625 782.4 864.6 849.5 1162 849.5 849.5 687.5 312.5 581 312.5 562.5 312.5 312.5 546.9 625 500 625 513.3 343.8 562.5 625 312.5 343.8 593.8 312.5 937.5 625 562.5 625 593.8 459.5 443.8 437.5 625 593.8 812.5 593.8 593.8 500 562.5 1125 562.5 562.5 562.5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 675.9 937.5 875 787 750 879.6 812.5 875 812.5 875 0 0 812.5 656.3 625 625 937.5 937.5 312.5 343.8 562.5 562.5 562.5 562.5 562.5 849.5 500 574.1 [...3131 lines suppressed...] 0000199638 00000 n 0000199937 00000 n 0000200236 00000 n 0000201612 00000 n 0000200632 00000 n 0000200931 00000 n 0000201230 00000 n 0000201529 00000 n 0000201996 00000 n 0000202019 00000 n 0000202041 00000 n trailer << /Size 221 /Root 2 0 R /Info 1 0 R >> startxref 202162 %%EOF |
|
From: Chris S. <san...@us...> - 2005-12-29 15:40:20
|
Update of /cvsroot/stack/stack-1-0/lang/nl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23073/lang/nl Modified Files: stack.php Log Message: Index: stack.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/lang/nl/stack.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** stack.php 14 Jul 2005 18:19:58 -0000 1.4 --- stack.php 29 Dec 2005 15:40:10 -0000 1.5 *************** *** 11,18 **** */ //////////////////////////////////////// ! // NEDERLANDS //////////////////////////////////////// $string['TrySTACKQuiz'] = 'Probeer een STACK quiz'; $string['STACKHomePage'] = 'STACK startpagina'; $string['Home'] = 'Start'; --- 11,19 ---- */ //////////////////////////////////////// ! // NEDERLANDS (Vertaling C. Bokhove) //////////////////////////////////////// $string['TrySTACKQuiz'] = 'Probeer een STACK quiz'; + $string['ReviewSTACKQuiz'] = 'Bewerk een STACK quiz'; $string['STACKHomePage'] = 'STACK startpagina'; $string['Home'] = 'Start'; *************** *** 29,39 **** $string['MarkExplain'] = 'Klik hier om de antwoorden na te kijken.'; $string['Validate'] = 'Valideer'; $string['ValidateExplain'] = 'Klik hier om controleren of uw antwoorden geen syntaxfouten bevat en het systeem ze verwerkt op de manier die u bedoelde.'; $string['ValidateExplain2'] = '(Merk op dat uw antwoorden opgeslagen worden als u valideert.)'; $string['Solutions'] = 'Oplossingen'; ! $string['SolutionsExplain'] = 'Klik hier om de hele quiz na te kijken en alle oplossingen te tonen.'; $string['SolutionsExplain2'] = '(Nieuwe pogingen worden niet meer toegestaan)'; $string['NewVersion'] = 'Nieuwe versie'; ! $string['NewVersionExplain'] = 'Klik hier om een nieuwe versie van deze quiz te proberen.'; $string['MarkSummary'] = 'Score Samenvatting'; $string['Question'] = 'Vraag'; --- 30,41 ---- $string['MarkExplain'] = 'Klik hier om de antwoorden na te kijken.'; $string['Validate'] = 'Valideer'; + $string['Valid'] = 'Valide'; $string['ValidateExplain'] = 'Klik hier om controleren of uw antwoorden geen syntaxfouten bevat en het systeem ze verwerkt op de manier die u bedoelde.'; $string['ValidateExplain2'] = '(Merk op dat uw antwoorden opgeslagen worden als u valideert.)'; $string['Solutions'] = 'Oplossingen'; ! $string['SolutionsExplain'] = 'Klik hier om de hele toets na te kijken en alle oplossingen te tonen.'; $string['SolutionsExplain2'] = '(Nieuwe pogingen worden niet meer toegestaan)'; $string['NewVersion'] = 'Nieuwe versie'; ! $string['NewVersionExplain'] = 'Klik hier om een nieuwe versie van deze toets te proberen.'; $string['MarkSummary'] = 'Score Samenvatting'; $string['Question'] = 'Vraag'; *************** *** 41,64 **** $string['Total'] = 'Totaal'; $string['Help'] = 'Help'; ! $string['End'] = 'Einde'; ! $string['ThisSTACKVer'] = 'Dit is STACK versie'; ! $string['ThisPageTook'] = 'Deze pagina werd in'; ! $string['seconds'] = 'seconden gemaakt'; ! $string['STACKlogo'] = 'STACK logo'; $string['QValidRequiredField'] = 'Dit is een verplicht veld, maar kent geen waarde.'; $string['QValidDefaultValue'] = 'Een standaardwaarde is toegekend.'; $string['QValidquestionnotar'] = '$question variabele bestaat niet!'; $string['QValidMaximaName'] = 'is een Maxima functie.'; $string['QInstCASError'] = 'CAS FOUT bij het uitvoeren!'; $string['CASError'] = 'CAS FOUT!'; $string['QMarkBailOut'] = 'WAARSCHUWING! STACK sluit af, aangezien de volgende prn meer dan eens bezocht is:'; $string['QTestTeacherInfo'] = 'Informatie voor de docent'; $string['QTestQuestionNote'] = 'Opmerkingen bij de vraag'; $string['Seed'] = 'Seed'; $string['QTestTeacherAns'] = "Antwoord van de docent"; $string['YourLastAns'] = 'Uw laatste antwoord was:'; $string['YouHaveNotAns'] = 'Waarschuwing: u heeft nog niet beantwoord.'; $string['InvalidAns'] = 'Dit is een ongeldig antwoord.'; $string['AttemptNoPenalty'] = 'Deze poging wordt zonder strafpunten genegeerd.'; $string['YourMarkFor'] = 'Uw score voor deze poging is'; $string['WithPenaltiesAnd'] = 'Met strafpunten, en vorige pogingen, geeft dit de score {$a[\'mark\']} uit {$a[\'QuVal\']}'; --- 43,91 ---- $string['Total'] = 'Totaal'; $string['Help'] = 'Help'; ! $string['Top'] = 'Boven'; ! $string['Bottom'] = 'Onder'; ! $string['Next'] = 'Volgende'; ! $string['Previous'] = 'Vorige'; ! $string['Count'] = 'Tel'; ! $string['Quiz_error_q'] = '<font color=\"red\">Fouten in de vraag!</font><br />Neem contact op met de beheerder over vraag {$a[0]}.<br />'; ! $string['quiz_page_created'] = 'Pagina gemaakt'; ! $string['quiz_version_no'] = 'Toets versie nummer'; // de toets id voor gasten. ! $string['quiz_version_no_err'] = 'U heeft een ongeldig toets ID opgegeven.'; ! $string['quiz_version_info1'] = 'Voor een nieuwe versie van deze toets laat u dit vak leeg. Indien u de toets pagina verlaat, houdt STACK niet bij welke versie van de toets u krijgt of antwoorden die u ingeeft. Om dezelfde versie van de toets te krijgen, noteert u de toets ID op de toets pagina. Deze kunt u later opgeven om dezelfde versie te krijgen. '; ! $string['quiz_version_info2'] = 'U bent aangemeld als gast. Indien u wilt dat STACK de versie van de toets, antwoorden en beoordelingen bewaart, dient u te registreren.'; ! $string['quiz_duedate'] = 'Inleverdatum toets'; ! $string['quiz_duedate_passed'] = 'De inleverdatum is verlopen. U kunt geen nieuwe pogingen meer wagen.'; ! ! $string['quiz_choose'] = 'Kies een toets'; ! $string['quiz_nonetochoose'] = 'Er zijn geen toetsen beschikbaar.'; ! ! $string['subject_choose'] = 'Kies een onderwerp'; ! $string['subject_nonetochoose'] = 'Er zijn geen onderwerpen beschikbaar.'; ! $string['QValidRequiredField'] = 'Dit is een verplicht veld, maar kent geen waarde.'; $string['QValidDefaultValue'] = 'Een standaardwaarde is toegekend.'; $string['QValidquestionnotar'] = '$question variabele bestaat niet!'; $string['QValidMaximaName'] = 'is een Maxima functie.'; + $string['QValidSummaryTable0'] = 'Het onderdeel is ongeldig, en de volgende velden bevatten fouten.'; + $string['QValidSummaryTable1'] = 'Een of meer van <b>{$a}</b> bevatten fouten:'; + $string['QValidSummaryTable2'] = 'De variabele \'$a\':'; + $string['QValidSummaryTable3'] = 'Potentieel antwoord \'$a\''; $string['QInstCASError'] = 'CAS FOUT bij het uitvoeren!'; $string['CASError'] = 'CAS FOUT!'; + $string['CASError_ans'] = 'De CAS heeft je antwoord niet verwerkt.'; $string['QMarkBailOut'] = 'WAARSCHUWING! STACK sluit af, aangezien de volgende prn meer dan eens bezocht is:'; + + // Docent: beeld bij proberen vragen. $string['QTestTeacherInfo'] = 'Informatie voor de docent'; $string['QTestQuestionNote'] = 'Opmerkingen bij de vraag'; $string['Seed'] = 'Seed'; $string['QTestTeacherAns'] = "Antwoord van de docent"; + + // $string['YourLastAns'] = 'Uw laatste antwoord was:'; $string['YouHaveNotAns'] = 'Waarschuwing: u heeft nog niet beantwoord.'; $string['InvalidAns'] = 'Dit is een ongeldig antwoord.'; $string['AttemptNoPenalty'] = 'Deze poging wordt zonder strafpunten genegeerd.'; + $string['YourMarkFor'] = 'Uw score voor deze poging is'; $string['WithPenaltiesAnd'] = 'Met strafpunten, en vorige pogingen, geeft dit de score {$a[\'mark\']} uit {$a[\'QuVal\']}'; *************** *** 68,71 **** --- 95,99 ---- $string['InputTool'] = 'Formule editor'; $string['SyntaxHint'] = 'Syntax hint'; + $string['TeacherAnsIs'] = 'Het antwoord van de docent is'; $string['ThisCanDisplay'] = 'Dit kan ingevoerd worden als'; *************** *** 75,78 **** --- 103,107 ---- $string['Answer'] = 'Antwoord'; $string['NoAttemptsAtQ'] = 'Uw heeft deze vraag nog niet geprobeerd.'; + $string['ShowAt_RawAns'] = 'Ruwe antwoord'; $string['ShowAt_Action'] = 'Actie'; *************** *** 83,87 **** --- 112,119 ---- $string['ShowAt_FeedBack'] = 'Feedback'; $string['ShowAt_AnswerNote'] = 'Opmerkingen bij het antwoord'; + + $string['SeriousForbid'] = 'De tekst <tt><font color=\'orange\'></font></tt> is niet toegestaan!<br />'; + $string['ForbidWord'] = 'Je antwoord bevat het verboden woord <tt> $a</tt>.'; $string['MissingRightBracket'] = 'Het antwoord mist een rechter haakje.'; $string['MissingLeftBracket'] = 'Het antwoord mist een linker haakje.'; *************** *** 89,104 **** $string['MissingStars'] = 'Het antwoord mist *\'en.<br /> Bedoelde u eigenlijk '; $string['BadAmps'] = 'Het antwoord mag geen @\'en bevatten. '; $string['BadAbsFun'] = 'Het antwoord mag geen |\'en bevatten. Voor absoluutstrepen kunt u de <tt>abs()</tt> CAS functie gebruiken.'; $string['UnknownFun'] = 'De tekst <tt><font color=\'orange\'>{$a[\'key\']}</font></tt> komt niet voor in de lijst met toegestane functies. Wellicht bent u vermenigvuldigingstekens, of haakjes vergeten. Bij problemen en vragen kunt u contact opnemen met de beheerder.'; $string['NotSupported'] = 'De tekst <tt><font color=\'orange\'>{$a[\'key\']}</font></tt> is een geldig CAS commando, maar wordt niet door STACK ondersteund. Wellicht is er een alternatief. Bij problemen en vragen kunt u contact opnemen met de beheerder.'; $string['EmptyCASString'] = 'Het antwoord is een lege <tt>casstring</tt>, hetgeen niet toegestaan is.'; $string['ErrorCASString'] = 'De tekst <font color=\'orange\'><tt>@{$a[\'key\']}@</tt></font> genereerde de volgende fout(en)'; $string['OddAmpCASString'] = 'Het antwoord bevat een oneven aantal @en, hetgeen niet toegestaan is.'; $string['IncorrectPassword'] = 'Incorrect wachtwoord!'; - $string['IncorrectAdminPsd'] = 'Incorrect Admin wachtwoord'; $string['UnknownUserName'] = 'Gebruikersnaam bestaat niet!'; $string['MisMatchPassword'] = 'De twee wachtwoorden zijn niet hetzelfde!'; $string['OldPasswordUnch'] = 'Uw oude wachtwoord is niet veranderd.'; $string['USR_Username'] = 'Gebruikersnaam'; $string['USR_NewPassword'] = 'Nieuwe wachtwoord'; $string['USR_ConfirmPsswd'] = '(bevestig)'; --- 121,145 ---- $string['MissingStars'] = 'Het antwoord mist *\'en.<br /> Bedoelde u eigenlijk '; $string['BadAmps'] = 'Het antwoord mag geen @\'en bevatten. '; + $string['BadIneqs'] = 'De ongelijkheden zijn niet correct. Je hebt witruimte tussen de symbolen, of de symbolen in de verkeerde volgorde, of beide.'; $string['BadAbsFun'] = 'Het antwoord mag geen |\'en bevatten. Voor absoluutstrepen kunt u de <tt>abs()</tt> CAS functie gebruiken.'; $string['UnknownFun'] = 'De tekst <tt><font color=\'orange\'>{$a[\'key\']}</font></tt> komt niet voor in de lijst met toegestane functies. Wellicht bent u vermenigvuldigingstekens, of haakjes vergeten. Bij problemen en vragen kunt u contact opnemen met de beheerder.'; $string['NotSupported'] = 'De tekst <tt><font color=\'orange\'>{$a[\'key\']}</font></tt> is een geldig CAS commando, maar wordt niet door STACK ondersteund. Wellicht is er een alternatief. Bij problemen en vragen kunt u contact opnemen met de beheerder.'; + + $string['CASERRInst'] = 'CAS FOUT!'; + + // CASText controleren $string['EmptyCASString'] = 'Het antwoord is een lege <tt>casstring</tt>, hetgeen niet toegestaan is.'; $string['ErrorCASString'] = 'De tekst <font color=\'orange\'><tt>@{$a[\'key\']}@</tt></font> genereerde de volgende fout(en)'; $string['OddAmpCASString'] = 'Het antwoord bevat een oneven aantal @en, hetgeen niet toegestaan is.'; + $string['IncorrectPassword'] = 'Incorrect wachtwoord!'; $string['UnknownUserName'] = 'Gebruikersnaam bestaat niet!'; + $string['NoUserNameGiven'] = 'Geen gebruikersnaam gegeven!'; $string['MisMatchPassword'] = 'De twee wachtwoorden zijn niet hetzelfde!'; + $string['EmptyPassword'] = 'Het wachtwoord mag niet leeg zijn.'; $string['OldPasswordUnch'] = 'Uw oude wachtwoord is niet veranderd.'; + $string['USR_Username'] = 'Gebruikersnaam'; + $string['USR_Password'] = 'Wachtwoord'; $string['USR_NewPassword'] = 'Nieuwe wachtwoord'; $string['USR_ConfirmPsswd'] = '(bevestig)'; *************** *** 129,132 **** --- 170,174 ---- $string['stackQuestion_questionSol'] = 'Uitgewerkte oplossing'; $string['stackQuestion_questionOptions'] = 'Opties'; + $string['stackQuestion_questionMetadata'] = 'Metadata'; $string['stackQuestion_questionNote'] = 'Vraag opmerking'; $string['stackQuestion_questionID'] = 'Unieke vraag ID'; *************** *** 139,142 **** --- 181,200 ---- $string['stackQuestion_questionDateLastEdited'] = 'Laatst bewerkt op'; + // <PDK> $stackQuestion metadata added + $string['stackQuestion_questionPublisher'] = 'Gepubliceerd op server'; + $string['stackQuestion_questionType'] = 'Soort inhoud'; + $string['stackQuestion_questionFormat'] = 'Digitale formaat'; + $string['stackQuestion_questionLanguage'] = 'Taal'; + $string['stackQuestion_questionLearningContext'] = 'Gericht op'; + $string['stackQuestion_questionDifficulty'] = 'Moeilijkheid'; + $string['stackQuestion_questionCompetency'] = 'Bijbehorende competenties'; + $string['stackQuestion_questionCompetencyLevel'] = 'Voorkennis'; + $string['stackQuestion_questionTimeAllocated'] = 'Aangeraden tijdstip'; + $string['stackQuestion_questionExcerciseType'] = 'Soort vraag'; + $string['stackQuestion_questionRights'] = 'Rechten'; + + // Used in the question bank order select form to indicate no selection. + $string['stackQuestion_NONE'] = '[GEEN]'; + // De $stackQuestionInst data structuur: instanties van de vragen *************** *** 148,155 **** --- 206,217 ---- $string['stackQuestion_PR_SAns'] = 'Expressie 1: SAns (Student antwoord)'; + $string['stackQuestion_PR_SAns2'] = 'SAns'; $string['stackQuestion_PR_TAns'] = 'Expressie 2: TAns (Docent antwoord)'; + $string['stackQuestion_PR_TAns2'] = 'TAns'; $string['stackQuestion_PR_AnsTest'] = 'Nakijkmethode'; $string['stackQuestion_PR_AnsTestOpt'] = 'Nakijkmethode opties'; + $string['stackQuestion_PR_AnsTestOpts'] = 'Methode opties'; $string['stackQuestion_PR_RawMarkMod'] = 'Hoe de score bewerken?'; + $string['stackQuestion_PR_RawMarkMod2'] = 'Bew'; $string['stackQuestion_PR_RawMark'] = 'Score bewerken met'; $string['stackQuestion_PR_Penalty'] = 'Strafpunten'; *************** *** 157,160 **** --- 219,272 ---- $string['stackQuestion_PR_AnswerNote'] = 'Antwoord opmerking'; $string['stackQuestion_PR_ApLat'] = 'Wat daarna doen?'; + $string['stackQuestion_PR_ApLat2'] = 'Volgende'; + + //////////////////////////////////// + // Toets + //////////////////////////////////// + $string['stackQuiz_quizid'] = 'Toets ID nummer'; + $string['stackQuiz_quizName'] = 'Toets naam'; + $string['stackQuiz_quizDescription'] = 'Beschrijving'; + $string['stackQuiz_quizOptions'] = 'Toets opties'; + $string['stackQuiz_quizDueDate'] = 'Inleverdatum'; + $string['stackQuiz_quizMode'] = 'Toets modus'; + $string['stackQuiz_quizKeywords'] = 'Trefwoorden'; + + $string['stackQuiz_quizPublisher'] = 'Gepubliceerd op'; + $string['stackQuiz_quizType'] = 'Soort inhoud'; + $string['stackQuiz_quizFormat'] = 'Digitale vorm'; + $string['stackQuiz_quizLanguage'] = 'Gebruikte taal'; + $string['stackQuiz_quizLearningContext']= 'Doelgroep:'; + $string['stackQuiz_quizDifficulty'] = 'Moeilijkheid'; + $string['stackQuiz_quizCompetency'] = 'Gebruikte competenties'; + $string['stackQuiz_quizCompetencyLevel']= 'Benodigde vaardigheden'; + $string['stackQuiz_quizTimeAllocated'] = 'Aangeraden tijdsduur'; + $string['stackQuiz_quizExcerciseType'] = 'Soort toets'; + $string['stackQuiz_quizRights'] = 'Rechten'; + + //////////////////////////////////// + // Onderwerp + //////////////////////////////////// + $string['stackSubject_subjectName'] = 'Onderwerp naam'; + $string['stackSubject_subjectID'] = 'Onderwerp ID nummer'; + $string['stackSubject_subjectDescription'] = 'Beschrijving'; + $string['stackSubject_subjectOptions'] = 'Onderwerp opties'; + $string['stackSubject_subjectMode'] = 'Onderwerp modus'; + $string['stackSubject_subjectOrder'] = 'Volgorde in Leergebied'; + $string['stackSubject_subjectHTMLHead'] = 'Onderwerp pagina koptekst'; + $string['stackSubject_subjectHTMLFoot'] = 'Onderwerp pagina voettekst'; + $string['stackSubject_subjectKeywords'] = 'Trefwoorden'; + + // <PDK> $stackQuestion metadata + $string['stackSubject_subjectPublisher'] = 'Gepubliceerd op'; + $string['stackSubject_subjectType'] = 'Soort inhoud'; + $string['stackSubject_subjectFormat'] = 'Digitale vorm'; + $string['stackSubject_subjectLanguage'] = 'Gebruikte taal'; + $string['stackSubject_subjectLearningContext']= 'Doelgroep:'; + $string['stackSubject_subjectDifficulty'] = 'Moeilijkheid'; + $string['stackSubject_subjectCompetency'] = 'Gebruikte competenties'; + $string['stackSubject_subjectCompetencyLevel']= 'Benodigde vaardigheden'; + $string['stackSubject_subjectTimeAllocated'] = 'Aangeraden tijdsduur'; + $string['stackSubject_subjectExcerciseType'] = 'Soort onderwerp'; + $string['stackSubject_subjectRights'] = 'Rechten'; //////////////////////////////////// *************** *** 162,170 **** //////////////////////////////////// $string['stackOptions_InsertStars'] = "Voeg *en in waar dat nodig is"; $string['stackOptions_InformalSyntax'] = 'Sta informele invoer toe'; $string['stackOptions_AllowInputTool'] = 'Invoer editor'; $string['stackOptions_SyntaxHint'] = 'Syntax Hint'; ! $string['stackOptions_Display'] = 'Uitvoer'; $string['stackOptions_Language'] = 'Taal'; $string['stackOptions_QuVal'] = 'Vraag waarde'; --- 274,293 ---- //////////////////////////////////// + // Bewerken en categorien. + $string['stackOptions_edit_value'] = 'Waarde'; // Waarde van een optie. + $string['stackOptions_edit_default'] = 'Standaardwaarde'; // Standaardwaarde van een optie. + $string['stackOptions_edit_inmeth'] = 'Invoer methoden'; + $string['stackOptions_edit_resppro'] = 'Antwoord Verwerking'; + $string['stackOptions_edit_out'] = 'Uitvoer'; + $string['stackOptions_InsertStars'] = "Voeg *en in waar dat nodig is"; $string['stackOptions_InformalSyntax'] = 'Sta informele invoer toe'; $string['stackOptions_AllowInputTool'] = 'Invoer editor'; $string['stackOptions_SyntaxHint'] = 'Syntax Hint'; ! $string['stackOptions_Display'] = 'Toon'; ! $string['stackOptions_Complex no'] = 'Complex getal'; ! $string['stackOptions_MultiplicationSign'] = 'Vermenigvuldigings teken'; ! $string['stackOptions_Floats'] = 'Geen kommagetallen toestaan'; ! $string['stackOptions_Simplify'] = 'Automatisch vereenvoudigen'; $string['stackOptions_Language'] = 'Taal'; $string['stackOptions_QuVal'] = 'Vraag waarde'; *************** *** 182,194 **** $string['stackOptions_FeedBackGenericPCorrect'] = 'Feedback: gedeeltelijk goed'; $string['stackOptions_FeedBackGenericPCorrect_def'] = "<font color='orange'>Het antwoord is gedeeltelijk goed.</font>"; ! $string['stackOptions_ShowSol'] = 'Laat oplossing zien'; //////////////////////////////////// ! // Vragenbank. //////////////////////////////////// ! $string['qp_notadmin'] = "<p><font color='red'>Waarschuwing!</font> Je bent niet de beheerder en daarom worden wijzigingen niet opgeslagen.</p>"; //////////////////////////////////// --- 305,367 ---- $string['stackOptions_FeedBackGenericPCorrect'] = 'Feedback: gedeeltelijk goed'; $string['stackOptions_FeedBackGenericPCorrect_def'] = "<font color='orange'>Het antwoord is gedeeltelijk goed.</font>"; ! $string['stackOptions_QuizMode'] = 'Toets modus'; ! $string['stackOptions_SubjectMode'] = 'Toegang voor'; //////////////////////////////////// ! // ListMenu strings. //////////////////////////////////// ! // Startpagina ! $string['menu_Login'] = 'Aanmelden'; ! $string['menu_Register'] = 'Registreer'; ! $string['menu_About'] = 'Over STACK'; ! $string['menu_QB'] = 'Vragenbank'; ! $string['menu_NewQ'] = 'Nieuwe vraag'; ! $string['menu_Author'] = 'Auteur docs'; ! $string['menu_Syntax'] = 'STACK commandos'; ! $string['menu_Options'] = 'Opties'; ! $string['menu_AnswerT'] = 'Nakijk methodes'; ! $string['menu_TestSuite'] = 'Test module'; ! $string['menu_FAQ'] = 'FAQ'; ! $string['menu_FAF'] = 'Fact sheet'; ! $string['menu_Maxima'] = 'Maxima'; ! $string['menu_CAS_Fn'] = 'CAS functies'; ! $string['menu_CAS_OL'] = 'CAS online'; ! $string['menu_CAS_OLML'] = 'MathML demo'; ! $string['menu_Install'] = 'Installeren'; ! $string['menu_Develop'] = 'Ontwikkelen'; ! $string['menu_Forum'] = 'Forum'; ! $string['menu_Sourceforge'] = 'Sourceforge'; ! $string['menu_Contact'] = 'Contact'; ! $string['menu_logo'] = "<img src='pics/logo.png' alt='STACK logo' />"; + // Nieuw op student pagina + + $string['menu_SelectQ'] = 'Selecteer Toets'; + $string['menu_SelectS'] = 'Selecteer Onderwerp'; + $string['menu_Update'] = 'Bewerk profiel'; + $string['menu_Logout'] = 'Afmelden'; + $string['menu_Help'] = 'Help'; + $string['menu_Practice'] = 'Oefen Modus'; + $string['menu_Assessment'] = 'Toets Modus'; + $string['menu_Answer_In'] = 'Invoer Antwoord'; + $string['menu_Display'] = "Stack's uitvoer"; + $string['menu_Forbidden'] = 'Verboden Anwtoorden'; + + // Nieuw op docent pagina + + $string['menu_QB'] = 'Vragen'; + $string['menu_New'] = 'Nieuw'; + $string['menu_Import'] = 'Importeer'; + $string['menu_Quizzes'] = 'Toetsen'; + $string['menu_Subjects'] = 'Onderwerpen'; + $string['menu_Zone'] = 'Leergebieden'; + $string['menu_Reporting'] = 'Rapporten'; + $string['menu_Qfields'] = 'Vraag velden'; + $string['menu_PR'] = 'Mogelijke antwoorden'; + $string['menu_User'] = 'Gebruiker'; + $string['menu_Enrole'] = 'Lijst klassen'; + $string['menu_Marksheet'] = 'Beoordeling'; //////////////////////////////////// *************** *** 202,208 **** //////////////////////////////////// ! $string['ATAlgEquiv_SA_notmatrix'] = 'Het antwoord zou een matrix moeten zijn, maar is dat niet.'; ! $string['ATAlgEquiv_SA_notlist'] = 'Het antwoord zou een lijst moeten zijn, maar is dat niet. Een lijst voer je in door een reeks door komma gescheiden symbolen binnen rechte haken te zetten.'; ! $string['ATAlgEquiv_SA_notset'] = 'Het antwoord zou een verzameling moeten zijn, maar is dat niet. Een verzameling voer je indoor komma gescheiden symbolen binnen accolades te zetten.'; $string['ATList_wronglen'] = 'De lijst zou {$a[0]} elementen moeten bevatten, maar het zijn er {$a[1]}. '; --- 375,388 ---- //////////////////////////////////// ! $string['AT_NOTIMPLEMENTED'] = 'Deze nakijk methode is nog niet geimplementeerdThis answer test has not been implemented.'; ! $string['Illegal_floats'] = 'Your answer contains floating point numbers, which are not allowed in this question. You need to type in numbers as fractions. For example, you should type 1/3 not 0.3333, which is after all only an approximation to one third.'; ! ! $string['ATAlgEquiv_SA_not_expression'] = 'Uw antwoord moet een expressie zijn, niet een vergelijking, ongelijkheid, lijst, verzameling of matrix.'; ! $string['ATAlgEquiv_SA_not_matrix'] = 'Uw antwoord moet een matrix zijn, maar is dat niet.'; ! $string['ATAlgEquiv_SA_not_list'] = 'Uw antwoord moet een lijst zijn, maar is dat niet. Een lijst voert u in door een lijst door kommas gescheiden waarden met RECHTE haken er om heen.'; ! $string['ATAlgEquiv_SA_not_set'] = 'Uw antwoord moet een verzameling zijn, maar is dat niet. Een verzameling voert u in door een lijst door kommas gescheiden waarden met ACCOLADES er om heen.'; ! $string['ATAlgEquiv_SA_not_equation'] = 'Uw antwoord moet een vergelijking zijn, maar is dat niet.'; ! $string['ATAlgEquiv_TA_not_equation'] = 'Uw antwoord is een vergelijking, maar het antwoord van de docent niet. U heeft geschreven zoiets als \$y=2\$ terwijl \$2\$ genoeg is.'; ! $string['ATAlgEquiv_SA_not_inequality'] = 'Uw antwoord moet een ongelijkheid zijn, maar is dat niet.'; $string['ATList_wronglen'] = 'De lijst zou {$a[0]} elementen moeten bevatten, maar het zijn er {$a[1]}. '; *************** *** 224,232 **** $string['ATFacForm_error_list'] = 'Het antwoord kon niet verwerkt worden. Neem contact op met de beheerder'; $string['ATFacForm_error_degreeSA'] = 'Het systeem kon de graad van je antwoord niet bepalen.'; - $string['ATFacForm_error_float'] = 'Je moet geen kommagetallen gebruiken. Gebruik alleen gehele getallen, breuken etc.'; $string['ATFacForm_isfactored'] = 'Het antwoord is ontbonden in factoren, goed gedaan. '; // needs a space at the end. $string['ATFacForm_notfactored'] = 'Het antwoord is niet ontbonden in factoren. '; // needs a space at the end. $string['ATFacForm_notalgequiv'] = 'Het antwoord is niet algebraisch gelijk aan het juiste antwoord. Je hebt iets fout gedaan.. '; // needs a space at the end. $string['ATInt_error_list'] = $string['ATFacForm_error_list']; $string['ATInt_const_int'] = 'Je moet nog een integratieconstante toevoegen. Dit moet een willekeurige constante zijn, niet een getal.'; --- 404,425 ---- $string['ATFacForm_error_list'] = 'Het antwoord kon niet verwerkt worden. Neem contact op met de beheerder'; $string['ATFacForm_error_degreeSA'] = 'Het systeem kon de graad van je antwoord niet bepalen.'; $string['ATFacForm_isfactored'] = 'Het antwoord is ontbonden in factoren, goed gedaan. '; // needs a space at the end. $string['ATFacForm_notfactored'] = 'Het antwoord is niet ontbonden in factoren. '; // needs a space at the end. $string['ATFacForm_notalgequiv'] = 'Het antwoord is niet algebraisch gelijk aan het juiste antwoord. Je hebt iets fout gedaan.. '; // needs a space at the end. + $string['ATPartFrac_error_list'] = $string['ATFacForm_error_list']; + $string['ATPartFrac_true'] = ''; + $string['ATPartFrac_single_fraction'] ='Uw antwoord is een enkelvoudige breuk, het moet een partiele breuk zijn. '; + $string['ATPartFrac_diff_variables'] ='De variabelen in uw antwoord zijn anders dan die in de vraag, controleer deze aub.'; + $string['ATPartFrac_denom_ret'] ='Indien uw antwoord als enkelvoudige breuk zou worden geschreven, dan zou de noemer {$a[0]} zijn. Dit zou echter {$a[1]} moeten zijn. '; + $string['ATPartFrac_ret_expression'] ='Uw antwoord als enkelvoudige breuk is {$a[0]} '; + + $string['ATSingFrac_error_list'] = $string['ATFacForm_error_list']; + $string['ATSingFrac_true'] = ''; + $string['ATSingFrac_part'] = 'Uw antwoord moet in een breuk staan, in de vorm a/b. '; + $string['ATSingFrac_var'] = 'De variabelen in uw antwoord zijn anders dan die in de vraag, controleer deze aub.'; + $string['ATSingFrac_ret_Q'] = 'Het lijkt er op dat u {$a[0]} vereenvoudigd heeft. '; + $string['ATSingFrac_ret_exp'] = 'Uw antwoord {$a[0]} is niet equivalent aan het antwoord. U moet iets fout hebben gedaan. '; + $string['ATInt_error_list'] = $string['ATFacForm_error_list']; $string['ATInt_const_int'] = 'Je moet nog een integratieconstante toevoegen. Dit moet een willekeurige constante zijn, niet een getal.'; *************** *** 238,241 **** --- 431,530 ---- $string['ATDiff_int'] = 'Je hebt nu geintegreerd!'; + //////////////////////////////////// + // Startpagina + //////////////////////////////////// + + $string['qp_notadmin'] = "<p><font color='red'>Waarschuwing!</font> U bent niet de beheerder. Wijzigingen worden niet in de database opgeslagen.</p>"; + + $string['FE_notadmin'] = 'Niet toegestaan!'; + $string['FE_needadmin'] = 'U moet aangemeld zijn als beheerder, maar bent de gebruiker {$a}.'; + $string['FE_loginhere'] = 'Meld u <a href=\'index.php?action=login\'>hier</a> aan'; + + $string['FE_errors_exist'] = 'Fouten!'; + $string['FE_errors_field'] = 'Het veld $a, gaf de volgende fouten.'; + + $string['FE_ALL'] = 'ALLE'; + $string['FE_(none)'] = '(geen)'; + $string['FE_Any'] = 'ELKE'; + + // Pagina koptekst + $string['FE_pagehead_loggedin'] = 'Aangemeld als <br/>{$a}'; + $string['FE_pagehead_notloggedin'] = 'Niet aangemeld.'; + + // Stack page footer. + $string['ThisSTACKVer'] = 'Dit is STACK versie'; + $string['ThisPageTook'] = 'Deze pagina werd in ongeveer'; + $string['seconds'] = 'seconden gemaakt'; + $string['STACKlogo'] = 'STACK logo'; + + // index.php + + $string['FE_index_logout'] = '<h1>Bedankt</h1><p>Bedankt voor het gebruiken van STACK.'; + $string['FE_index_welcome'] = '<h1>Welkom</h1> <p>Welkom bij STACK, {$a[0]} {$a[1]}.</p>'; + $string['FE_index_loginerr'] = '<h1>Problemen met aanmelden.</h1> <p>U kon niet worden aangemeld als <tt>{$a}</tt> om de volgende reden.</p>'; + $string['FE_index_loginscreen_title'] = 'Aanmelden'; + $string['FE_index_loginscreen_guestok'] = 'U kunt zich aanmelden met gebruikersnaam \"guest\" en een leeg wachtwoord.'; + $string['FE_index_loginscreen_pleasereg'] = 'Registreer bij deze STACK server:'; + $string['FE_index_button_login'] = 'Aanmelden'; + $string['FE_index_button_register'] = 'Registreer'; + $string['FE_index_update_info_title'] = 'Bewerk profiel'; + $string['FE_index_update_info_instruct'] = 'Om uw profiel bij te werken, vult u het volgende formulier in.'; + $string['FE_index_update_button'] = 'Bijwerken'; + $string['FE_index_update_info_guest'] = 'Meld u eerst af en meld u weer aan als gebruiker om uw profiel te bewerken.'; + $string['FE_index_register_title'] = 'Registreer als nieuwe gebruiker'; + $string['FE_index_register_instruct'] = 'Om te registreren, dient u de volgende informatie in te voeren.'; + $string['FE_index_email'] = 'Voor informatie mailt u naar <a href=\'mailto:{$a}\'>$a</a>'; + + $string['FE_user_nousers'] = 'Er zijn geen gebruikers in de database.'; + + // Strings bij toetsen. + $string['FE_quiz_title'] = 'Toets pagina'; + $string['FE_quiz_download'] = 'Download het volgende bestand.'; + $string['FE_quiz_lastmark'] = 'Laatste beoordeling'; + $string['FE_quiz_none'] = 'Er zijn geen toetsen meer om uit te proberen.'; + $string['FE_quiz_results'] = 'Resultaten toets: {$a}'; + $string['FE_quiz_no_questions'] = 'Er zitten geen vragen in deze toets. Neem contact op met de beheerder.'; + $string['FE_quiz_no_atttempts'] = 'Deze toets is nog niet geprobeerd.'; + + // Strings bij onderwerpen. + $string['FE_subject_title'] = 'Onderwerp pagina'; + $string['FE_subject_open'] = 'Vrij toegankelijke onderwerpen'; + $string['FE_subject_closed'] = 'Onderwerpen waarvoor u geregistreerd bent'; + $string['FE_subject_none'] = 'Er zijn geen onderwerpen meer om uit te proberen.'; + + $string['FE_analysis_qu_title'] = 'Analyse voor de volgende vraag:'; + $string['FE_analysis_qu_err'] = 'Dit is een fout: deze vraag zou moeten bestaan, maar is er niet!'; + $string['FE_analysis_qu_notadmin'] = '<font color=\'red\'>Waarschuwing!</font> U bent niet de beheerder en mag daarom alleen pogingen van gasten bekijken.'; + $string['FE_analysis_qu_stats'] = 'Aantal pogingen: {$a[0]}. gemiddelde: {$a[1]}, variantie: {$a[2]}'; + $string['FE_analysis_qu_noatt'] = 'Aantal pogingen: 0'; + $string['FE_analysis_qu_noatts'] = 'Er zijn nog geen pogingen gedaan om deze vragen te maken.'; + $string['FE_analysis_qu_mark'] = 'Behaalde resultaat'; + $string['FE_analysis_qu_mark_full'] = 'Alles goed'; + $string['FE_analysis_qu_mark_nfm'] = 'Niet alles goed'; + $string['FE_analysis_qu_mark_nz'] = 'Niet alles fout'; + $string['FE_analysis_qu_mark_zm'] = 'Alles fout'; + $string['FE_analysis_qu_start'] = 'Start tijd'; + $string['FE_analysis_qu_start_ex'] = 'eg \'Oct 17 2004 16:34\', of \'nu -1 dag\''; + $string['FE_analysis_qu_end'] = 'Eind tijd'; + $string['FE_analysis_qu_button'] = 'Analyse'; + $string['FE_analysis_choose_title'] = 'Analyse van antwoorden op een enkele vraag</h1>'; + $string['FE_analysis_choose_info'] = 'Voer de informatie in voor antwoorden van studenten die u wilt zien:'; + $string['FE_analysis_action'] = 'Actie gevraagd'; + $string['FE_Valid_only'] = 'Alleen geldig'; + $string['FE_Invalid_only'] = 'Alleen ongeldig'; + + $string['FE_user_title'] = 'Gebruikers beheer'; + $string['FE_user_title_warn'] = 'Merk op dat er geen optie \'ongedaan maken\' is.'; + $string['FE_user_action'] = 'Actie'; + $string['FE_user_action_review'] = 'Bekijk'; + $string['FE_user_action_update'] = 'Bijwerken'; + $string['FE_user_action_delete'] = 'Verwijder'; + $string['FE_user_action_submit'] = 'Bevestig'; + $string['FE_user_review'] = 'Bekijk het werk van $a'; + $string['FE_user_deleted'] = 'gebruiker verwijderd. U kunt deze actie niet \'ongedaan maken\'.'; + $string['FE_user_enrolled'] = 'Gebruikers bij dit onderwerp'; + $string['FE_user_not_enrolled'] = 'Gebruikers NIET bij dit onderwerp'; + + $string[''] = ''; $string[''] = ''; |
|
From: Chris S. <san...@us...> - 2005-12-21 13:03:40
|
Update of /cvsroot/stack/stack-1-0 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20848 Modified Files: index.php quiz.php Log Message: Index: quiz.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/quiz.php,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** quiz.php 27 Nov 2005 11:30:52 -0000 1.49 --- quiz.php 21 Dec 2005 13:03:24 -0000 1.50 *************** *** 125,132 **** // Check the $quizid is in the $subject, or we are the admin user. ! if (!stack_db_subject_quiz_contained($subjectID,$quizid) AND ( -1 != $user['id'] OR !$user['loggedin'] )) { ! echo "The quizID number is not linked to the subjectID numbers supplied."; ! die(); } // Get the particular quiz, without hidden questions. $quiz = stack_db_quiz_get($quizid,FALSE); --- 125,142 ---- // Check the $quizid is in the $subject, or we are the admin user. ! if (-1 != $user['id']) { // The admin user can do what they like! ! ! if (!stack_db_subject_quiz_contained($subjectID,$quizid)) { ! echo "The quizID=$quizid number is not linked to the subjectID=$subjectID numbers supplied. Please click <a href='index.php'>here</a>."; ! die(); ! } ! ! if (!$user['loggedin'] ) { ! echo "You are not logged in correctly, and may not access this page directly. Please click <a href='index.php'>here</a>."; ! die(); ! } ! } + // Get the particular quiz, without hidden questions. $quiz = stack_db_quiz_get($quizid,FALSE); Index: index.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/index.php,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** index.php 28 Nov 2005 12:56:28 -0000 1.37 --- index.php 21 Dec 2005 13:03:24 -0000 1.38 *************** *** 110,114 **** $subjectID = $_POST['subjectID']; $subject = stack_db_subject_get($subjectID,FALSE); ! $_SESSION['subject'] = $subject; } else if (array_key_exists('subject',$_SESSION)) { $subject = $_SESSION['subject']; --- 110,114 ---- $subjectID = $_POST['subjectID']; $subject = stack_db_subject_get($subjectID,FALSE); ! $_SESSION['subject']=$subject; } else if (array_key_exists('subject',$_SESSION)) { $subject = $_SESSION['subject']; *************** *** 117,120 **** --- 117,121 ---- } + switch ($action) { case 'loginscreen': |
|
From: Chris S. <san...@us...> - 2005-12-21 13:03:40
|
Update of /cvsroot/stack/stack-1-0/frontend_general In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20848/frontend_general Modified Files: loginregister.php Log Message: Index: loginregister.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/frontend_general/loginregister.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** loginregister.php 28 Nov 2005 15:30:05 -0000 1.10 --- loginregister.php 21 Dec 2005 13:03:23 -0000 1.11 *************** *** 89,94 **** } ! //$_SESSION['user'] = $user; ! session_register($user); ?> --- 89,93 ---- } ! $_SESSION['user'] = $user; ?> |
|
From: Chris S. <san...@us...> - 2005-12-10 16:51:26
|
Update of /cvsroot/stack/stack-1-0 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29805 Modified Files: question_bank.php Log Message: Index: question_bank.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/question_bank.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** question_bank.php 28 Nov 2005 12:56:28 -0000 1.18 --- question_bank.php 10 Dec 2005 16:51:14 -0000 1.19 *************** *** 48,52 **** $questionInst = ''; ! $options = ''; $RawAns = ''; --- 48,52 ---- $questionInst = ''; ! $options = stack_options_set(NULL); $RawAns = ''; |
|
From: Chris S. <san...@us...> - 2005-11-29 11:23:36
|
Update of /cvsroot/stack/stack-1-0/lang/en/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16868/lang/en/doc Modified Files: about_install.php Log Message: Index: about_install.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/lang/en/doc/about_install.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** about_install.php 29 Nov 2005 11:21:49 -0000 1.9 --- about_install.php 29 Nov 2005 11:23:17 -0000 1.10 *************** *** 111,116 **** must be available to establish a connection with the external applications.</li> </ul> ! There are enabled by default. Apart from this ! requirement there are no special PHP settings. <p>For mail alterts (which are not fully implemented) --- 111,116 ---- must be available to establish a connection with the external applications.</li> </ul> ! These are enabled by default. Apart from this ! requirement there seem to be no special PHP settings. <p>For mail alterts (which are not fully implemented) |
|
From: Chris S. <san...@us...> - 2005-11-29 11:22:01
|
Update of /cvsroot/stack/stack-1-0/lang/en/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16673/lang/en/doc Modified Files: about_install.php Log Message: Index: about_install.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/lang/en/doc/about_install.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** about_install.php 29 Nov 2005 11:12:07 -0000 1.8 --- about_install.php 29 Nov 2005 11:21:49 -0000 1.9 *************** *** 42,46 **** <ul> <li>A web server, such as <a href="http://www.apache.org/">Apache</a>, ! running <a href="http://www.php.net/">PHP</a>I have been using versions after 5.0. (There should be no reason why STACK will not work with version 4.4 or later, however some users have reported that sessions do not work. If you can offer advice here, that would be --- 42,46 ---- <ul> <li>A web server, such as <a href="http://www.apache.org/">Apache</a>, ! running <a href="http://www.php.net/">PHP</a>. I have been using versions after 5.0. (There should be no reason why STACK will not work with version 4.4 or later, however some users have reported that sessions do not work. If you can offer advice here, that would be *************** *** 48,59 **** Windows users could use <a href="http://www.easyphp.org/">EasyPHP</a>.</li> <li>You need to convex LaTeX to HTML with <a href="http://hutchinson.belmont.ma.us/tth/">TtH</a>. ! <li>The computer algebra system (<a href="#cas">see below</a>) ! <a href="http://maxima.sourceforge.net/">Maxima</a>. Version 5.9.1 is needed. Version 5.9.2 is the latest release, but is not currently supported - this will change in the near future. (Note, for those on a Microsoft platform, the <a href="http://wxmaxima.sourceforge.net/">wxMaxima</a> front end is much better than that distributed with Maxima itself and is well worth installing for testing CAS code outside STACK)</li> ! <li>For graphical support we have used the <a href="http://www.gnuplot.info/">GNUPLOT</a> package, version 4.0. ! (Note, this is already supplied on Fedora 3 distributions, and comes with Maxima 5.9.1 on Windows) </ul> Finally of course --- 48,59 ---- Windows users could use <a href="http://www.easyphp.org/">EasyPHP</a>.</li> <li>You need to convex LaTeX to HTML with <a href="http://hutchinson.belmont.ma.us/tth/">TtH</a>. ! <li>The computer algebra system <a href="http://maxima.sourceforge.net/">Maxima</a> (<a href="#cas">see below</a>). ! Version 5.9.1 is needed. Version 5.9.2 is the latest release, but is not currently supported - this will change in the near future. (Note, for those on a Microsoft platform, the <a href="http://wxmaxima.sourceforge.net/">wxMaxima</a> front end is much better than that distributed with Maxima itself and is well worth installing for testing CAS code outside STACK)</li> ! <li>(for graphical support we have used the <a href="http://www.gnuplot.info/">GNUPLOT</a> package, version 4.0. ! This is already supplied on Fedora 3 distributions, and comes with Maxima 5.9.1 on Windows.) </ul> Finally of course |
|
From: Chris S. <san...@us...> - 2005-11-29 11:12:18
|
Update of /cvsroot/stack/stack-1-0/lang/en/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15245/lang/en/doc Modified Files: about_install.php Log Message: Index: about_install.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/lang/en/doc/about_install.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** about_install.php 27 Nov 2005 11:30:52 -0000 1.7 --- about_install.php 29 Nov 2005 11:12:07 -0000 1.8 *************** *** 42,47 **** <ul> <li>A web server, such as <a href="http://www.apache.org/">Apache</a>, ! running <a href="http://www.php.net/">PHP</a> (at least version 4.3.9), <!--(version 5 if using the CAS Pool)--></li> ! and <a href="http://www.mysql.com/">MySQL</a> server (at least version 4.1).<br /> Windows users could use <a href="http://www.easyphp.org/">EasyPHP</a>.</li> <li>You need to convex LaTeX to HTML with <a href="http://hutchinson.belmont.ma.us/tth/">TtH</a>. --- 42,49 ---- <ul> <li>A web server, such as <a href="http://www.apache.org/">Apache</a>, ! running <a href="http://www.php.net/">PHP</a>I have been using versions after 5.0. (There ! should be no reason why STACK will not work with version 4.4 or later, however ! some users have reported that sessions do not work. If you can offer advice here, that would be ! most welcome...)<br /> Windows users could use <a href="http://www.easyphp.org/">EasyPHP</a>.</li> <li>You need to convex LaTeX to HTML with <a href="http://hutchinson.belmont.ma.us/tth/">TtH</a>. |
|
From: Chris S. <san...@us...> - 2005-11-28 15:30:26
|
Update of /cvsroot/stack/stack-1-0 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7611 Modified Files: chat.php Log Message: Index: chat.php =================================================================== RCS file: /cvsroot/stack/stack-1-0/chat.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** chat.php 28 Nov 2005 12:56:28 -0000 1.13 --- chat.php 28 Nov 2005 15:30:05 -0000 1.14 *************** *** 40,45 **** // echo "Session in:"; show_array($_SESSION); - - // Process incoming data $errors=''; --- 40,43 ---- |
