[Axiom-developer] 20081225.03.tpd.patch (algebra/Makefile move layers 11, 12, 13)

[daly]

Renumber layers 11, 12, and 13 downward as graph collapses.
=====================================================================
diff --git a/changelog b/changelog
index 7d0ef17..2a9f666 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,5 @@
+20081225 tpd src/axiom-website/patches.html 20081225.03.tpd.patch
+20081225 tpd src/algebra/Makefile move layers 11, 12, 13
 20081225 tpd src/axiom-website/patches.html 20081225.02.tpd.patch
 20081225 tpd src/algebra/Makefile move layer 10, MAPPKG4
 20081225 tpd src/axiom-website/patches.html 20081225.01.tpd.patch
diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet
index 20cfb51..a60cf0f 100644
--- a/src/algebra/Makefile.pamphlet
+++ b/src/algebra/Makefile.pamphlet
@@ -309,15 +309,17 @@ LAYER6=\
 
 @
 \subsection{Layer7}
-Depends on: AMR FIELD FIELD- FLAGG FLAGG- FRETRCT PADICCT RADCAT XFALG 
+Depends on: AMR FIELD FIELD- FLAGG FLAGG- FRETRCT PADICCT RADCAT XFALG \\
+Used by next layer: A1AGG A1AGG- ARR2CAT FAMR FPC LIECAT LZSTAGG OREPCAT PSCAT 
+TRANFUN VSPACE XPOLYC
 <<layer7>>=
 
 LAYER7=\
   ${OUT}/A1AGG.o    ${OUT}/A1AGG-.o   ${OUT}/ARR2CAT.o  ${OUT}/ARR2CAT-.o \
   ${OUT}/ASP34.o    ${OUT}/BBTREE.o   ${OUT}/BFUNCT.o   ${OUT}/BPADIC.o   \
   ${OUT}/BTREE.o    ${OUT}/CRAPACK.o  ${OUT}/DEQUEUE.o  ${OUT}/DLIST.o    \
-  ${OUT}/DRAWCX.o   ${OUT}/D01GBFA.o  ${OUT}/D02EJFA.o  ${OUT}/D03FAFA.o  \
-  ${OUT}/DRAWPT.o   ${OUT}/FAMR.o     ${OUT}/FAMR-.o    ${OUT}/FLASORT.o  \
+  ${OUT}/DRAWCX.o   ${OUT}/DRAWPT.o   ${OUT}/D01GBFA.o  ${OUT}/D02EJFA.o  \
+  ${OUT}/D03FAFA.o  ${OUT}/FAMR.o     ${OUT}/FAMR-.o    ${OUT}/FLASORT.o  \
   ${OUT}/FLAGG2.o   ${OUT}/FGROUP.o   ${OUT}/FM.o       ${OUT}/FM1.o      \
   ${OUT}/FPC.o      ${OUT}/FPC-.o     ${OUT}/FMONOID.o  ${OUT}/INDE.o     \
   ${OUT}/IPADIC.o   ${OUT}/IROOT.o    ${OUT}/IR2.o      ${OUT}/LEXP.o     \
@@ -341,191 +343,84 @@ LAYER7=\
 
 @
 \subsection{Layer8}
-
+Depends on: A1AGG A1AGG- ARR2CAT FAMR FPC LIECAT LZSTAGG OREPCAT PSCAT 
+TRANFUN VSPACE XPOLYC
+Used by next layer: BTAGG FLALG MATCAT SRAGG VECTCAT 
 <<layer8>>=
 
 LAYER8=\
+  ${OUT}/APPLYORE.o ${OUT}/ARRAY1.o   ${OUT}/ARRAY12.o  ${OUT}/ARRAY2.o   \
+  ${OUT}/ASTACK.o   ${OUT}/BTAGG.o    ${OUT}/BTAGG-.o   ${OUT}/COMBINAT.o \
+  ${OUT}/CSTTOOLS.o ${OUT}/D01FCFA.o  ${OUT}/E04MBFA.o  ${OUT}/FAMR2.o    \
+  ${OUT}/FARRAY.o   ${OUT}/FLALG.o    ${OUT}/GALUTIL.o  ${OUT}/HEAP.o     \
+  ${OUT}/IARRAY1.o  ${OUT}/IARRAY2.o  ${OUT}/IFARRAY.o  ${OUT}/INTCAT.o   \
+  ${OUT}/INTHEORY.o ${OUT}/IRREDFFX.o ${OUT}/LFCAT.o    ${OUT}/LODOCAT.o  \
+  ${OUT}/LODOCAT-.o ${OUT}/LWORD.o    ${OUT}/MATCAT.o   ${OUT}/MATCAT-.o  \
+  ${OUT}/MATSTOR.o  ${OUT}/ORESUP.o   ${OUT}/OREPCTO.o  ${OUT}/OREUP.o    \
+  ${OUT}/PLOT3D.o   ${OUT}/PR.o       ${OUT}/PREASSOC.o ${OUT}/PRIMARR2.o \
+  ${OUT}/REDORDER.o ${OUT}/SRAGG.o    ${OUT}/SRAGG-.o   ${OUT}/STREAM.o   \
+  ${OUT}/SYMPOLY.o  ${OUT}/TS.o       ${OUT}/TUPLE.o    ${OUT}/UPSCAT.o   \
+  ${OUT}/UPSCAT-.o  ${OUT}/VECTCAT.o  ${OUT}/VECTCAT-.o ${OUT}/XDPOLY.o   \
+  ${OUT}/XEXPPKG.o  ${OUT}/XF.o       ${OUT}/XF-.o      ${OUT}/XPBWPOLY.o \
+  ${OUT}/XPOLY.o    ${OUT}/XRPOLY.o \
   layer8done
 
 @
 \subsection{Layer9}
-
+Depends on: BTAGG FLALG MATCAT SRAGG VECTCAT
+Used by next layer: IVECTOR PTCAT STRICAT 
 <<layer9>>=
 
 LAYER9=\
+  ${OUT}/BITS.o    ${OUT}/DIRPROD2.o ${OUT}/IMATRIX.o  ${OUT}/IVECTOR.o \
+  ${OUT}/LPOLY.o   ${OUT}/LSMP.o     ${OUT}/LSMP1.o    ${OUT}/MATCAT2.o \
+  ${OUT}/PTCAT.o   ${OUT}/STRICAT.o  ${OUT}/TRIMAT.o  \
   layer9done
 
 @
 \subsection{Layer10}
-
+Depends on: IVECTOR PTCAT STRICAT
 <<layer10>>=
 
 LAYER10=\
+  ${OUT}/ASSOCEQ.o  ${OUT}/CARTEN.o   ${OUT}/CLIF.o     ${OUT}/CLIP.o     \
+  ${OUT}/COORDSYS.o ${OUT}/DBASE.o    ${OUT}/DHMATRIX.o ${OUT}/DIOSP.o    \
+  ${OUT}/DIRPCAT.o  ${OUT}/DIRPCAT-.o ${OUT}/D02BBFA.o  ${OUT}/D02BHFA.o  \
+  ${OUT}/D02CJFA.o  ${OUT}/FAXF.o     ${OUT}/FAXF-.o    ${OUT}/FFPOLY2.o  \
+  ${OUT}/FNLA.o     ${OUT}/GRAY.o     ${OUT}/HB.o       ${OUT}/IRSN.o     \
+  ${OUT}/MCALCFN.o  ${OUT}/MHROWRED.o ${OUT}/NUMODE.o   ${OUT}/NUMQUAD.o  \
+  ${OUT}/ODESYS.o   ${OUT}/ODETOOLS.o ${OUT}/ORDFUNS.o  ${OUT}/PERMAN.o   \
+  ${OUT}/PFECAT.o   ${OUT}/PFECAT-.o  ${OUT}/POINT.o    ${OUT}/PSEUDLIN.o \
+  ${OUT}/PTPACK.o   ${OUT}/REP2.o     ${OUT}/SETMN.o    ${OUT}/SEX.o      \
+  ${OUT}/STRING.o   ${OUT}/SYMFUNC.o  ${OUT}/VECTOR2.o \
   layer10done
 
 @
 \subsection{Layer11}
-\subsubsection{Completed spad files}
-\begin{verbatim}
-array1.spad.pamphlet (PRIMARR PRIMARR2 TUPLE IFARRAY FARRAY IARRAY1 ARRAY1
-                      ARRAY12)
-combinat.spad.pamphlet (COMBINAT)
-ffx.spad.pamphlet (IRREDFFX)
-galutil.spad.pamphlet (GALUTIL)
-matstor.spad.pamphlet (MATSTOR)
-ore.spad.pamphlet (OREPCAT APPLYORE AUTOMOR OREPCTO ORESUP OREUP)
-stream.spad.pamphlet (LZSTAGG CSTTOOLS STREAM STREAM1 STREAM2 STREAM3)
-xlpoly.spad.pamphlet (MAGMA LWORD LIECAT FLALG XEXPPKG LPOLY PBWLB XPBWPOLY
-                      LEXP)
-\end{verbatim}
 
 <<layer11>>=
 
 LAYER11=\
-  ${OUT}/APPLYORE.o ${OUT}/ARRAY1.o   ${OUT}/ARRAY12.o  ${OUT}/ARRAY2.o   \
-  ${OUT}/ASTACK.o   ${OUT}/BTAGG.o    ${OUT}/BTAGG-.o   ${OUT}/COMBINAT.o \
-  ${OUT}/CSTTOOLS.o ${OUT}/D01FCFA.o  ${OUT}/E04MBFA.o  \
-  ${OUT}/FAMR2.o \
-  ${OUT}/FARRAY.o   \
-  ${OUT}/FLALG.o    ${OUT}/GALUTIL.o  ${OUT}/HEAP.o     ${OUT}/IARRAY1.o  \
-  ${OUT}/IARRAY2.o  ${OUT}/IFARRAY.o  ${OUT}/INTCAT.o   ${OUT}/INTHEORY.o \
-  ${OUT}/IRREDFFX.o ${OUT}/LFCAT.o    ${OUT}/LODOCAT.o  ${OUT}/LODOCAT-.o \
-  ${OUT}/LWORD.o    ${OUT}/MATCAT.o   ${OUT}/MATCAT-.o  ${OUT}/MATSTOR.o  \
-  ${OUT}/ORESUP.o   ${OUT}/OREPCTO.o  ${OUT}/OREUP.o    ${OUT}/PLOT3D.o   \
-  ${OUT}/PR.o       ${OUT}/PREASSOC.o ${OUT}/PRIMARR2.o ${OUT}/REDORDER.o \
-  ${OUT}/SRAGG.o    ${OUT}/SRAGG-.o   ${OUT}/STREAM.o   ${OUT}/SYMPOLY.o  \
-  ${OUT}/TS.o       ${OUT}/TUPLE.o    ${OUT}/UPSCAT.o   ${OUT}/UPSCAT-.o  \
-  ${OUT}/VECTCAT.o  ${OUT}/VECTCAT-.o ${OUT}/XDPOLY.o   ${OUT}/XEXPPKG.o  \
-  ${OUT}/XF.o       ${OUT}/XF-.o      ${OUT}/XPBWPOLY.o ${OUT}/XPOLY.o    \
-  ${OUT}/XRPOLY.o \
   layer11done
 
 @
 \subsection{Layer12}
-\subsubsection{Completed spad files}
-\begin{verbatim}
-\end{verbatim}
 
 <<layer12>>=
 
 LAYER12=\
- ${OUT}/BITS.o    ${OUT}/DIRPROD2.o ${OUT}/IMATRIX.o  ${OUT}/IVECTOR.o \
- ${OUT}/LPOLY.o   ${OUT}/LSMP.o     ${OUT}/LSMP1.o    ${OUT}/MATCAT2.o \
- ${OUT}/PTCAT.o   ${OUT}/STRICAT.o  ${OUT}/TRIMAT.o  \
   layer12done
 
 @
 \subsection{Layer13}
-\subsubsection{Completed spad files}
-\begin{verbatim}
-carten.spad.pamphlet (GRMOD GRALG CARTEN CARTEN2)
-clip.spad.pamphlet (CLIP)
-coordsys.spad.pamphlet (COORDSYS)
-ffpoly2.spad.pamphlet (FFPOLY2)
-irsn.spad.pamphlet (IRSN)
-numode.spad.pamphlet (NUMODE)
-numquad.spad.pamphlet (NUMQUAD)
-perman.spad.pamphlet (GRAY PERMAN)
-pseudolin.spad.pamphlet (PSEUDLIN)
-rep2.spad.pamphlet (REP2)
-solvedio.spad.pamphlet (DIOSP)
-\end{verbatim}
 
 <<layer13>>=
 
 LAYER13=\
-  ${OUT}/ASSOCEQ.o  ${OUT}/CARTEN.o   ${OUT}/CLIF.o     ${OUT}/CLIP.o     \
-  ${OUT}/COORDSYS.o ${OUT}/DBASE.o    ${OUT}/DHMATRIX.o ${OUT}/DIOSP.o    \
-  ${OUT}/DIRPCAT.o  ${OUT}/DIRPCAT-.o ${OUT}/D02BBFA.o  ${OUT}/D02BHFA.o  \
-  ${OUT}/D02CJFA.o  ${OUT}/FAXF.o     ${OUT}/FAXF-.o    ${OUT}/FFPOLY2.o  \
-  ${OUT}/FNLA.o     ${OUT}/GRAY.o     ${OUT}/HB.o       ${OUT}/IRSN.o     \
-  ${OUT}/MCALCFN.o  ${OUT}/MHROWRED.o ${OUT}/NUMODE.o   ${OUT}/NUMQUAD.o  \
-  ${OUT}/ODESYS.o   ${OUT}/ODETOOLS.o ${OUT}/ORDFUNS.o  ${OUT}/PERMAN.o   \
-  ${OUT}/PFECAT.o   ${OUT}/PFECAT-.o  ${OUT}/POINT.o    ${OUT}/PSEUDLIN.o \
-  ${OUT}/PTPACK.o   ${OUT}/REP2.o     ${OUT}/SETMN.o    ${OUT}/SEX.o      \
-  ${OUT}/STRING.o   ${OUT}/SYMFUNC.o  ${OUT}/VECTOR2.o \
   layer13done
 
 @
 \subsection{Layer14}
-\subsubsection{Completed spad files}
-\begin{verbatim}
-allfact.spad.pamphlet (MRATFAC MPRFF MPCPF GENMFACT RFFACTOR SUPFRACF)
-bezout.spad.pamphlet (BEZOUT)
-brill.spad.pamphlet (BRILL)
-cden.spad.pamphlet (ICDEN CDEN UPCDEN MCDEN)
-contfrac.spad.pamphlet (CONTFRAC NCNTFRAC)
-cycles.spad.pamphlet (CYCLES EVALCYC)
-cyclotom.spad.pamphlet (CYCLOTOM)
-ddfact.spad.pamphlet (DDFACT)
-equation2.spad.pamphlet (EQ EQ2 FEVALAB)
-error.spad.pamphlet (ERROR)
-facutil.spad.pamphlet (FACUTIL PUSHVAR)
-ffcat.spad.pamphlet (FPC XF FAXF DLP FFIELDC FFSLPE)
-fff.spad.pamphlet (FFF)
-ffhom.spad.pamphlet (FFHOM)
-ffpoly.spad.pamphlet (FFPOLY)
-formula.spad.pamphlet (FORMULA FORMULA1)
-fraction.spad.pamphlet (LO LA QFCAT QFCAT2 FRAC LPEFRAC FRAC2)
-galfactu.spad.pamphlet (GALFACTU)
-galpolyu.spad.pamphlet (GALPOLYU)
-gb.spad.pamphlet (GB)
-gbeuclid.spad.pamphlet (GBEUCLID)
-gbintern.spad.pamphlet (GBINTERN)
-gdirprod.spad.pamphlet (ORDFUNS ODP HDP SHDP)
-geneez.spad.pamphlet (GENEEZ)
-ghensel.spad.pamphlet (GHENSEL)
-gpgcd.spad.pamphlet (GENPGCD)
-groebf.spad.pamphlet (GBF)
-groebsol.spad.pamphlet (GROEBSOL)
-intrf.spad.pamphlet (SUBRESP MONOTOOL INTHERTR INTTR INTRAT INTRF)
-idecomp.spad.pamphlet (IDECOMP)
-leadcdet.spad.pamphlet (LEADCDET)
-lindep.spad.pamphlet (LINDEP ZLINDEP)
-lingrob.spad.pamphlet (LGROBP)
-listgcd.spad.pamphlet (HEUGCD)
-matfuns.spad.pamphlet (IMATLIN MATCAT2 RMCAT2 IMATQF MATLIN)
-mfinfact.spad.pamphlet (MFINFACT)
-mlift.spad.pamphlet (MLIST)
-moddfact.spad.pamphlet (MDDFACT)
-multsqfr.spad.pamphlet (MULTSQFR)
-newpoint.spad.pamphlet (PTCAT POINT COMPPROP SUBSPACE PTPACK PTFUNC2)
-numtheor.spad.pamphlet (INTHEORY PNTHEORY)
-npcoef.spad.pamphlet (NPCOEF)
-omdev.spad.pamphlet (OMENC OMDEV OMCONN OMPKG)
-omserver.spad.pamphlet (OMSERVER)
-pdecomp.spad.pamphlet (PCOMP PDECOMP)
-pfbr.spad.pamphlet (PFBRU PFBR)
-pfr.spad.pamphlet (PFR PFRPAC)
-pgcd.spad.pamphlet (PGCD)
-pinterp.spad.pamphlet (PINTERPA PINTERP)
-pleqn.spad.pamphlet (PLEQN)
-poltopol.spad.pamphlet (MPC2 MPC3 POLTOPOL)
-poly.spad.pamphlet (FM PR SUP SUP2 UP UP2 POLY2UP UPSQFREE PSQFR UPMP)
-polycat.spad.pamphlet (AMR FAMR POLYCAT POLYLIFT UPOLYC UPOLYC2 COMMUPC)
-prs.spad.pamphlet (PRS)
-radix.spad.pamphlet (RADIX BINARY DECIMAL HEXADEC RADUTIL)
-ratfact.spad.pamphlet (RATFACT)
-rderf.spad.pamphlet (RDETR)
-realzero.spad.pamphlet (REAL0)
-real0q.spad.pamphlet (REAL0Q)
-rf.spad.pamphlet (POLYCATQ RF)
-solvefor.spad.pamphlet (SOLVEFOR)
-solvelin.spad.pamphlet (LSMP LSMP1 LSPP)
-smith.spad.pamphlet (SMITH)
-sttf.spad.pamphlet (STTF STTFNC)
-sturm.spad.pamphlet (SHP)
-sum.spad.pamphlet (ISUMP GOSPER SUMRF)
-tex.spad.pamphlet (TEX)
-twofact.spad.pamphlet (NORMRETR TWOFACT)
-unifact.spad.pamphlet (UNIFACT)
-updecomp.spad.pamphlet (UPDECOMP)
-updivp.spad.pamphlet (UPDIVP)
-viewdef.spad.pamphlet (VIEWDEF)
-vector.spad.pamphlet (VECTCAT IVECTOR VECTOR VECTOR2 DIRPCAT DIRPROD DIRPROD2)
-void.spad.pamphlet (VOID EXIT)
-weier.spad.pamphlet (WEIER)
-\end{verbatim}
 
 <<layer14>>=
 
diff --git a/src/axiom-website/patches.html b/src/axiom-website/patches.html
index bd746ae..4ca6300 100644
--- a/src/axiom-website/patches.html
+++ b/src/axiom-website/patches.html
@@ -851,8 +851,10 @@ algebra/Makefile collapse layer 4 into 1 and 2<br/>
 algebra/Makefile collapse layer 5 into layer 2<br/>
 <a href="patches/20081225.01.tpd.patch">20081225.01.tpd.patch</a>
 algebra/Makefile move layers 7,8,9 <br/>
-<a href="patches/20081225.01.tpd.patch">20081225.01.tpd.patch</a>
+<a href="patches/20081225.02.tpd.patch">20081225.02.tpd.patch</a>
 algebra/Makefile move layer 10, MAPPKG4 <br/>
+<a href="patches/20081225.03.tpd.patch">20081225.03.tpd.patch</a>
+algebra/Makefile move layers 11, 12, 13 <br/>
 
  </body>
 </html>