Menu
▾
▴
[Stack-cvs] stack-dev/maxima stackmaxima.mac,1.40,1.41
|
From: Eligio <eli...@us...> - 2008-04-04 11:45:40
|
Update of /cvsroot/stack/stack-dev/maxima In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv3338/maxima Modified Files: stackmaxima.mac Log Message: ECP 04/04/2008: Latest testsuite version added, marged stackmaxima changes added. Index: stackmaxima.mac =================================================================== RCS file: /cvsroot/stack/stack-dev/maxima/stackmaxima.mac,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** stackmaxima.mac 3 Apr 2008 11:45:18 -0000 1.40 --- stackmaxima.mac 4 Apr 2008 11:45:36 -0000 1.41 *************** *** 1565,1574 **** ret0:ret, /* print("ATEqnRet for AE of SA with SB ",ret),*/ ! if is(ret[1]=true) then block( if (equationp(SB) and equationp(SA)) then block ([ret1,ret2], ret1:ATEqnRet(lhs(SA),lhs(SB),var,AT), ! /* print("ATEqnRet for AT LHSs of SA with SB ",ret1),*/ ret2:ATEqnRet(rhs(SA),rhs(SB),var,AT), ! /* print("ATEqnRet for AT RHSs of SA with SB ",ret2),*/ if (ret1[3]=concat("ATE_unknowntest_",AT) or ret2[3]=concat("ATE_unknowntest_",AT)) then ret:[false,0,ret1[3],""] --- 1565,1574 ---- ret0:ret, /* print("ATEqnRet for AE of SA with SB ",ret),*/ ! if (is(ret[1]=true) and not(is("AE"=AT)))then block( if (equationp(SB) and equationp(SA)) then block ([ret1,ret2], ret1:ATEqnRet(lhs(SA),lhs(SB),var,AT), ! /* print("ATEqnRet for AT LHSs of SA with SB ",ret1),*/ ret2:ATEqnRet(rhs(SA),rhs(SB),var,AT), ! /* print("ATEqnRet for AT RHSs of SA with SB ",ret2),*/ if (ret1[3]=concat("ATE_unknowntest_",AT) or ret2[3]=concat("ATE_unknowntest_",AT)) then ret:[false,0,ret1[3],""] *************** *** 1584,1591 **** else block( /* print("In [1]<>false else loop"),*/ ! if (is(ret1[2]=1) and is(ret2[2]=1)) then ret:[true,1,concat(AT,"E_L",AT,"_R",AT),""] /* e.g. PFE_LPF_RPF or IE_LI_RI */ else if (is(ret1[2]=0) and is(ret2[2]=0)) then block( ret[3]:concat(concat(AT,"E_N",AT)," ",ret1[3]," ",ret2[3]), /* the inner concat is probably unnecessary but is there for clarity, for now */ ret[4]:concat(ret1[4],ret2[4]), --- 1584,1592 ---- else block( /* print("In [1]<>false else loop"),*/ ! if (is(ret1[2]=1) and is(ret2[2]=1) and not(is(rhs(SA)=rhs(SB))) and not(is(lhs(SA)=lhs(SB)))) then ret:[true,1,concat(AT,"E_L",AT,"_R",AT),""] /* e.g. PFE_LPF_RPF or IE_LI_RI */ else if (is(ret1[2]=0) and is(ret2[2]=0)) then block( + ret[2]:0, ret[3]:concat(concat(AT,"E_N",AT)," ",ret1[3]," ",ret2[3]), /* the inner concat is probably unnecessary but is there for clarity, for now */ ret[4]:concat(ret1[4],ret2[4]), *************** *** 1594,1599 **** else if is(rhs(SA)=rhs(SB)) then block( ! if is(ret1[2]=1) then ! ret[3]:concat(concat(AT,"E_L",AT,"_RU")," ",ret1[3]), return(ret) ) --- 1595,1624 ---- else if is(rhs(SA)=rhs(SB)) then block( ! if is(lhs(SA)=lhs(SB)) then ! if is(ret1[2]=1) then ! if is(ret2[2]=1) then ! ret[3]:concat(AT,"E_LU_RU") ! else ! (ret[3]:concat(concat(AT,"E_LU_RU")," ",ret2[3]),ret[2]:0) ! else ! if is(ret2[2]=1) then ! (ret[3]:concat(concat(AT,"E_LU_RU")," ",ret1[3]),ret[2]:0) ! else ! (ret[3]:concat(concat(AT,"E_LU_RU")," ",ret1[3]," ",ret2[3]),ret[2]:0) ! else ! if is(ret1[2]=1) then ! if is(ret2[2]=1) then ! (ret[3]:concat(AT,"E_L",AT,"_RU"),ret[2]:1) ! else ! (ret[3]:concat(concat(AT,"E_L",AT,"_RU")," ",ret2[3]),ret[2]:0) ! else ! if is(ret2[2]=1) then ! (ret[3]:concat(concat(AT,"E_L",AT,"_RU")," ",ret1[3]),ret[2]:0) ! else ! (ret[3]:concat(concat(AT,"E_L",AT,"_RU")," ",ret1[3]," ",ret2[3]),ret[2]:0), ! /* if is(ret1[2]=1) then ! ret[3]:concat(AT,"E_L",AT,"_RU") ! else ! (ret[3]:concat(concat(AT,"E_LN",AT,"_RU")," ",ret1[3]),ret[2]:0), */ return(ret) ) *************** *** 1601,1605 **** if is(lhs(SA)=lhs(SB)) then block( if is(ret2[2]=1) then ! ret[3]:concat(concat(AT,"E_LU_R",AT)," ",ret2[3]), return(ret) ) --- 1626,1632 ---- if is(lhs(SA)=lhs(SB)) then block( if is(ret2[2]=1) then ! (ret[3]:concat(AT,"E_LU_R",AT),ret[2]:1) ! else ! (ret[3]:concat(concat(AT,"E_LU_RN",AT)," ",ret2[3]),ret[2]:0), return(ret) ) *************** *** 1607,1614 **** --- 1634,1643 ---- if is(ret1[2]=1) then block( ret[3]:concat(concat(AT,"E_L",AT,"_RN")," ",ret2[3]), + ret[2]:0, return(ret) ) else block( ret[3]:concat(concat(AT,"E_LN_R",AT)," ",ret1[3]), + ret[2]:0, return(ret) ) *************** *** 1616,1625 **** ) ) ! else ! ret:PartFracfun(SA,SB,var) ) else ( ! /* if (ret0[1]=false) then ( */ ! /* print("In new loop"),*/ if equationp(SA) then ret:[false,0,concat(AT,"E_SAE_SBN"),"ATAlgEquiv_SA_not_equation"] --- 1645,1658 ---- ) ) ! else block( ! ret:ATEqnRet(SA,SB,var,AT), ! if is(ret[2]=0) then ! ret[3]:concat(concat(AT,"E_not_eqns")," ",ret[3]) ! else ! ret[3]:concat(AT,"E_not_eqns") ! ) ) else ( ! if not(is("AE"=AT)) then if equationp(SA) then ret:[false,0,concat(AT,"E_SAE_SBN"),"ATAlgEquiv_SA_not_equation"] *************** *** 1627,1633 **** if equationp(SB) then ret:[false,0,concat(AT,"E_SBE_SAN"),"ATAlgEquiv_TA_not_equation"] ! /* ) */ ! else ! ret:[false,0,concat(AT,"E_NAE_other"),""] ), return(ret) --- 1660,1665 ---- if equationp(SB) then ret:[false,0,concat(AT,"E_SBE_SAN"),"ATAlgEquiv_TA_not_equation"] ! else ! ret:[false,0,concat(AT,"E_NAE_other"),""] ), return(ret) |