[Stack-cvs] stack-dev/maxima stackmaxima.mac,1.84.2.4,1.84.2.5

[Matthew B. <ba...@us...>]

Update of /cvsroot/stack/stack-dev/maxima
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv14143/maxima

Modified Files:
      Tag: grobner
	stackmaxima.mac 
Log Message:
Updates to the ATSysEquiv function and those which it calls.

Index: stackmaxima.mac
===================================================================
RCS file: /cvsroot/stack/stack-dev/maxima/stackmaxima.mac,v
retrieving revision 1.84.2.4
retrieving revision 1.84.2.5
diff -C2 -d -r1.84.2.4 -r1.84.2.5
*** stackmaxima.mac	15 Nov 2010 14:28:52 -0000	1.84.2.4
--- stackmaxima.mac	17 Nov 2010 13:11:00 -0000	1.84.2.5
***************
*** 30,34 ****
    /*Reload plot commands */
  
!   load("stackPlot.mac"),
  
    MAXIMA_VERSION:map(parse_string, tokens(?\*autoconf\-version\*, 'digitcharp)),
--- 30,34 ----
    /*Reload plot commands */
  
!   /*load("stackPlot.mac"),*/
  
    MAXIMA_VERSION:map(parse_string, tokens(?\*autoconf\-version\*, 'digitcharp)),
***************
*** 1113,1117 ****
      SAB:errcatch(ev(SB,simp,fullratsimp,nouns)),
      if (is(SAB=[STACKERROR]) or is(SAB=[])) then return(StackReturnOb("0","ATLowestTerms_STACKERROR_TAns","")),
! 
  	/* Are both answers lists? */
  	if not listp(SA) then
--- 1113,1117 ----
      SAB:errcatch(ev(SB,simp,fullratsimp,nouns)),
      if (is(SAB=[STACKERROR]) or is(SAB=[])) then return(StackReturnOb("0","ATLowestTerms_STACKERROR_TAns","")),
! 	
  	/* Are both answers lists? */
  	if not listp(SA) then
***************
*** 1151,1155 ****
  
  	varlist: listofvars(S2),
! 	if not is(listofvars(S1)=varlist) then
  		return(ATSysEquivVars(S1,S2)),
  
--- 1151,1155 ----
  
  	varlist: listofvars(S2),
! 	if not is(ev(setify(listofvars(S1)),simp)=ev(setify(varlist), simp)) then
  		return(ATSysEquivVars(S1,S2)),
  
***************
*** 1189,1193 ****
  		return(StackReturnOb("0","ATSysEquiv_SA_missing_variables",StackAddFeedback("","ATSysEquiv_SA_missing_variables"))),
  	if subsetp(XB,XA) then
! 		return(StackReturnOb("0","ATSysEquiv_SA_extra_variables",StackAddFeedback("","ATSysEquiv_SA_extra_variables")))
  )$
  
--- 1189,1194 ----
  		return(StackReturnOb("0","ATSysEquiv_SA_missing_variables",StackAddFeedback("","ATSysEquiv_SA_missing_variables"))),
  	if subsetp(XB,XA) then
! 		return(StackReturnOb("0","ATSysEquiv_SA_extra_variables",StackAddFeedback("","ATSysEquiv_SA_extra_variables"))),
! 	return(StackReturnOb("0","ATSysEquiv_SA_wrong_variables",StackAddFeedback("","ATSysEquiv_SA_wrong_variables")))
  )$
  
***************
*** 1201,1205 ****
  */
  
! ATSysEquivGrob(GA,GB,S1,varlist):=block([retl,ret],
  
  	/* Is the student's system underdetermined? */
--- 1202,1206 ----
  */
  
! ATSysEquivGrob(GA,GB,SA,varlist):=block([retl,ret],
  
  	/* Is the student's system underdetermined? */
***************
*** 1215,1223 ****
  	ret:[],
  	
! 	for k:1 thru length(S1) do block([],
! 		if ev(poly_grobner_member(stack_eqnprepare(stack_eval_assignments(exdowncase(S1[k]))), GB, varlist),simp) then
! 			ret:append(ret,[S1[ev(k,simp)]])
  		else
! 			ret:append(ret,[texcolor("red", S1[ev(k,simp)])])),
  
  	return(StackReturnOb("0","ATSysEquiv_SA_system_overdetermined",StackAddFeedback("","ATSysEquiv_SA_system_overdetermined", StackDISP(ret, "\$\$"))))
--- 1216,1224 ----
  	ret:[],
  	
! 	for k:1 thru length(SA) do block([],
! 		if ev(poly_grobner_member(stack_eqnprepare(stack_eval_assignments(exdowncase(SA[k]))), GB, varlist),simp) then
! 			ret:append(ret,[SA[ev(k,simp)]])
  		else
! 			ret:append(ret,[texcolor("red", SA[ev(k,simp)])])),
  
  	return(StackReturnOb("0","ATSysEquiv_SA_system_overdetermined",StackAddFeedback("","ATSysEquiv_SA_system_overdetermined", StackDISP(ret, "\$\$"))))